Migrate TestSketchArchiveRelativeSketchPathWithRelativeZipPathWithIncludeBuildDirFlag from test_sketch.py to sketch_test.go

Author: MatteoPologruto

internal/integrationtest/sketch/sketch_test.go

@@ -611,3 +611,21 @@ func TestSketchArchiveAbsoluteSketchPathWithIncludeBuildDirFlag(t *testing.T) {
 	defer require.NoError(t, archive.Close())
 	verifyZipContainsSketchIncludingBuildDir(t, archive.File)
 }
+
+func TestSketchArchiveRelativeSketchPathWithRelativeZipPathWithIncludeBuildDirFlag(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	_ = cli.CopySketch("sketch_simple")
+	// Creates a folder where to save the zip
+	archivesFolder := cli.WorkingDir().Join("my_archives")
+	require.NoError(t, archivesFolder.Mkdir())
+
+	_, _, err := cli.Run("sketch", "archive", "./sketch_simple", "./my_archives", "--include-build-dir")
+	require.NoError(t, err)
+
+	archive, err := zip.OpenReader(cli.WorkingDir().Join("my_archives", "sketch_simple.zip").String())
+	require.NoError(t, err)
+	defer require.NoError(t, archive.Close())
+	verifyZipContainsSketchIncludingBuildDir(t, archive.File)
+}

test/test_sketch.py

@@ -48,25 +48,6 @@ def verify_zip_contains_sketch_including_build_dir(files):
     assert "sketch_simple/build/arduino.avr.uno/sketch_simple.ino.with_bootloader.hex" in files
 
 
-def test_sketch_archive_relative_sketch_path_with_relative_zip_path_with_include_build_dir_flag(
-    run_command, copy_sketch, working_dir
-):
-    copy_sketch("sketch_simple")
-    # Creates a folder where to save the zip
-    archives_folder = f"{working_dir}/my_archives/"
-    Path(archives_folder).mkdir()
-
-    result = run_command(["sketch", "archive", "./sketch_simple", "./my_archives", "--include-build-dir"])
-    assert result.ok
-
-    archive = zipfile.ZipFile(f"{working_dir}/my_archives/sketch_simple.zip")
-    archive_files = archive.namelist()
-
-    verify_zip_contains_sketch_including_build_dir(archive_files)
-
-    archive.close()
-
-
 def test_sketch_archive_relative_sketch_path_with_absolute_zip_path_with_include_build_dir_flag(
     run_command, copy_sketch, working_dir
 ):