Skip to content

Commit 877d9a7

Browse files
Migrate TestSketchArchiveAbsoluteSketchPathWithRelativeZipPathWithIncludeBuildDirFlag from test_sketch.py to sketch_test.go
1 parent 270987c commit 877d9a7

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

internal/integrationtest/sketch/sketch_test.go

+18
Original file line numberDiff line numberDiff line change
@@ -719,3 +719,21 @@ func TestSketchArchiveRelativeSketchPathWithAbsoluteZipPathAndNameWithExtensionW
719719
defer require.NoError(t, archive.Close())
720720
verifyZipContainsSketchIncludingBuildDir(t, archive.File)
721721
}
722+
723+
func TestSketchArchiveAbsoluteSketchPathWithRelativeZipPathWithIncludeBuildDirFlag(t *testing.T) {
724+
env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
725+
defer env.CleanUp()
726+
727+
_ = cli.CopySketch("sketch_simple")
728+
// Creates a folder where to save the zip
729+
archivesFolder := cli.WorkingDir().Join("my_archives")
730+
require.NoError(t, archivesFolder.Mkdir())
731+
732+
_, _, err := cli.Run("sketch", "archive", cli.WorkingDir().Join("sketch_simple").String(), "./my_archives", "--include-build-dir")
733+
require.NoError(t, err)
734+
735+
archive, err := zip.OpenReader(cli.WorkingDir().Join("my_archives", "sketch_simple.zip").String())
736+
require.NoError(t, err)
737+
defer require.NoError(t, archive.Close())
738+
verifyZipContainsSketchIncludingBuildDir(t, archive.File)
739+
}

test/test_sketch.py

-19
Original file line numberDiff line numberDiff line change
@@ -48,25 +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_relative_zip_path_with_include_build_dir_flag(
52-
run_command, copy_sketch, working_dir
53-
):
54-
copy_sketch("sketch_simple")
55-
# Creates a folder where to save the zip
56-
archives_folder = f"{working_dir}/my_archives/"
57-
Path(archives_folder).mkdir()
58-
59-
result = run_command(["sketch", "archive", f"{working_dir}/sketch_simple", "./my_archives", "--include-build-dir"])
60-
assert result.ok
61-
62-
archive = zipfile.ZipFile(f"{working_dir}/my_archives/sketch_simple.zip")
63-
archive_files = archive.namelist()
64-
65-
verify_zip_contains_sketch_including_build_dir(archive_files)
66-
67-
archive.close()
68-
69-
7051
def test_sketch_archive_absolute_sketch_path_with_absolute_zip_path_with_include_build_dir_flag(
7152
run_command, copy_sketch, working_dir
7253
):

0 commit comments

Comments
 (0)