Skip to content

Commit 00003e3

Browse files
Migrate TestSketchArchiveAbsoluteSketchPathWithAbsoluteZipPathWithIncludeBuildDirFlag from test_sketch.py to sketch_test.go
1 parent 877d9a7 commit 00003e3

File tree

2 files changed

+18
-21
lines changed

2 files changed

+18
-21
lines changed

internal/integrationtest/sketch/sketch_test.go

+18
Original file line numberDiff line numberDiff line change
@@ -737,3 +737,21 @@ func TestSketchArchiveAbsoluteSketchPathWithRelativeZipPathWithIncludeBuildDirFl
737737
defer require.NoError(t, archive.Close())
738738
verifyZipContainsSketchIncludingBuildDir(t, archive.File)
739739
}
740+
741+
func TestSketchArchiveAbsoluteSketchPathWithAbsoluteZipPathWithIncludeBuildDirFlag(t *testing.T) {
742+
env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
743+
defer env.CleanUp()
744+
745+
_ = cli.CopySketch("sketch_simple")
746+
// Creates a folder where to save the zip
747+
archivesFolder := cli.WorkingDir().Join("my_archives")
748+
require.NoError(t, archivesFolder.Mkdir())
749+
750+
_, _, err := cli.Run("sketch", "archive", cli.WorkingDir().Join("sketch_simple").String(), archivesFolder.String(), "--include-build-dir")
751+
require.NoError(t, err)
752+
753+
archive, err := zip.OpenReader(archivesFolder.Join("sketch_simple.zip").String())
754+
require.NoError(t, err)
755+
defer require.NoError(t, archive.Close())
756+
verifyZipContainsSketchIncludingBuildDir(t, archive.File)
757+
}

test/test_sketch.py

-21
Original file line numberDiff line numberDiff line change
@@ -48,27 +48,6 @@ def verify_zip_contains_sketch_including_build_dir(files):
4848
assert "sketch_simple/build/arduino.avr.uno/sketch_simple.ino.with_bootloader.hex" in files
4949

5050

51-
def test_sketch_archive_absolute_sketch_path_with_absolute_zip_path_with_include_build_dir_flag(
52-
run_command, copy_sketch, working_dir
53-
):
54-
# Creates a folder where to save the zip
55-
archives_folder = f"{working_dir}/my_archives/"
56-
Path(archives_folder).mkdir()
57-
58-
result = run_command(
59-
["sketch", "archive", f"{working_dir}/sketch_simple", archives_folder, "--include-build-dir"],
60-
copy_sketch("sketch_simple"),
61-
)
62-
assert result.ok
63-
64-
archive = zipfile.ZipFile(f"{archives_folder}/sketch_simple.zip")
65-
archive_files = archive.namelist()
66-
67-
verify_zip_contains_sketch_including_build_dir(archive_files)
68-
69-
archive.close()
70-
71-
7251
def test_sketch_archive_absolute_sketch_path_with_relative_zip_path_and_name_without_extension_with_include_build_dir_flag( # noqa
7352
run_command, copy_sketch, working_dir
7453
):

0 commit comments

Comments
 (0)