Skip to content

Commit a743eb7

Browse files
Migrate TestSketchArchiveWithMultipleMainFiles from test_sketch.py to sketch_test.go
1 parent eb55eab commit a743eb7

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

Diff for: internal/integrationtest/sketch/sketch_test.go

+17
Original file line numberDiff line numberDiff line change
@@ -849,3 +849,20 @@ func TestSketchArchiveWithPdeMainFile(t *testing.T) {
849849
defer require.NoError(t, archive.Close())
850850
require.Contains(t, archive.File[0].Name, paths.New(sketchName, sketchName+".pde").String())
851851
}
852+
853+
func TestSketchArchiveWithMultipleMainFiles(t *testing.T) {
854+
env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
855+
defer env.CleanUp()
856+
857+
sketchName := "sketch_multiple_main_files"
858+
sketchDir := cli.CopySketch(sketchName)
859+
sketchFile := sketchDir.Join(sketchName + ".pde")
860+
relPath, err := sketchFile.RelFrom(sketchDir)
861+
require.NoError(t, err)
862+
cli.SetWorkingDir(sketchDir)
863+
_, stderr, err := cli.Run("sketch", "archive")
864+
require.Error(t, err)
865+
require.Contains(t, string(stderr), "Sketches with .pde extension are deprecated, please rename the following files to .ino")
866+
require.Contains(t, string(stderr), relPath.String())
867+
require.Contains(t, string(stderr), "Error archiving: Can't open sketch: multiple main sketch files found")
868+
}

Diff for: test/test_sketch.py

-11
Original file line numberDiff line numberDiff line change
@@ -48,17 +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_multiple_main_files(run_command, copy_sketch, working_dir):
52-
sketch_name = "sketch_multiple_main_files"
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.failed
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-
assert "Error archiving: Can't open sketch: multiple main sketch files found" in res.stderr
60-
61-
6251
def test_sketch_archive_case_mismatch_fails(run_command, data_dir):
6352
sketch_name = "ArchiveSketchCaseMismatch"
6453
sketch_path = Path(data_dir, sketch_name)

0 commit comments

Comments
 (0)