Skip to content

Commit eb55eab

Browse files
Migrate TestSketchArchiveWithPdeMainFile from test_sketch.py to sketch_test.go
1 parent 5e3c9f0 commit eb55eab

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

internal/integrationtest/sketch/sketch_test.go

+22
Original file line numberDiff line numberDiff line change
@@ -827,3 +827,25 @@ func TestSketchArchiveAbsoluteSketchPathWithAbsoluteZipPathAndNameWithExtensionW
827827
defer require.NoError(t, archive.Close())
828828
verifyZipContainsSketchIncludingBuildDir(t, archive.File)
829829
}
830+
831+
func TestSketchArchiveWithPdeMainFile(t *testing.T) {
832+
env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
833+
defer env.CleanUp()
834+
835+
sketchName := "sketch_pde_main_file"
836+
sketchDir := cli.CopySketch(sketchName)
837+
sketchFile := sketchDir.Join(sketchName + ".pde")
838+
relPath, err := sketchFile.RelFrom(sketchDir)
839+
require.NoError(t, err)
840+
cli.SetWorkingDir(sketchDir)
841+
_, stderr, err := cli.Run("sketch", "archive")
842+
require.NoError(t, err)
843+
require.Contains(t, string(stderr), "Sketches with .pde extension are deprecated, please rename the following files to .ino")
844+
require.Contains(t, string(stderr), relPath.String())
845+
cli.SetWorkingDir(env.RootDir())
846+
847+
archive, err := zip.OpenReader(cli.WorkingDir().Join(sketchName + ".zip").String())
848+
require.NoError(t, err)
849+
defer require.NoError(t, archive.Close())
850+
require.Contains(t, archive.File[0].Name, paths.New(sketchName, sketchName+".pde").String())
851+
}

test/test_sketch.py

-17
Original file line numberDiff line numberDiff line change
@@ -48,23 +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_with_pde_main_file(run_command, copy_sketch, working_dir):
52-
sketch_name = "sketch_pde_main_file"
53-
sketch_dir = copy_sketch(sketch_name)
54-
sketch_file = Path(sketch_dir, f"{sketch_name}.pde")
55-
res = run_command(["sketch", "archive"], sketch_dir)
56-
assert res.ok
57-
assert "Sketches with .pde extension are deprecated, please rename the following files to .ino" in res.stderr
58-
assert str(sketch_file.relative_to(sketch_dir)) in res.stderr
59-
60-
archive = zipfile.ZipFile(f"{working_dir}/{sketch_name}.zip")
61-
archive_files = archive.namelist()
62-
63-
assert f"{sketch_name}/{sketch_name}.pde" in archive_files
64-
65-
archive.close()
66-
67-
6851
def test_sketch_archive_with_multiple_main_files(run_command, copy_sketch, working_dir):
6952
sketch_name = "sketch_multiple_main_files"
7053
sketch_dir = copy_sketch(sketch_name)

0 commit comments

Comments
 (0)