Migrate TestCompileAndUploadComboWithPdeExtension from test_upload.py…

… to upload_test.go

internal/integrationtest/upload/upload_test.go

@@ -297,3 +297,46 @@ func TestCompileAndUploadComboWithCustomBuildPath(t *testing.T) {
 		require.Contains(t, traces, "Upload successful")
 	}
 }
+
+func TestCompileAndUploadComboSketchWithPdeExtension(t *testing.T) {
+	if os.Getenv("CI") != "" {
+		t.Skip("VMs have no serial ports")
+	}
+
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	_, _, err := cli.Run("update")
+	require.NoError(t, err)
+
+	sketchName := "CompileAndUploadPdeSketch"
+	sketchPath := cli.SketchbookDir().Join(sketchName)
+
+	// Create a test sketch
+	_, _, err = cli.Run("sketch", "new", sketchPath.String())
+	require.NoError(t, err)
+
+	// Renames sketch file to pde
+	sketchFile := sketchPath.Join(sketchName + ".pde")
+	require.NoError(t, sketchPath.Join(sketchName+".ino").Rename(sketchFile))
+
+	for _, board := range detectedBoards(t, cli) {
+		// Install core
+		_, _, err = cli.Run("core", "install", board.core)
+		require.NoError(t, err)
+
+		// Build sketch and upload from folder
+		waitForBoard(t, cli)
+		_, stderr, err := cli.Run("compile", "--clean", "-b", board.fqbn, "-u", "-p", board.address, sketchPath.String())
+		require.NoError(t, err)
+		require.Contains(t, string(stderr), "Sketches with .pde extension are deprecated, please rename the following files to .ino")
+		require.Contains(t, string(stderr), sketchFile.String())
+
+		// Build sketch and upload from file
+		waitForBoard(t, cli)
+		_, stderr, err = cli.Run("compile", "--clean", "-b", board.fqbn, "-u", "-p", board.address, sketchFile.String())
+		require.NoError(t, err)
+		require.Contains(t, string(stderr), "Sketches with .pde extension are deprecated, please rename the following files to .ino")
+		require.Contains(t, string(stderr), sketchFile.String())
+	}
+}

test/test_upload.py

@@ -42,38 +42,6 @@ def test_upload_after_attach(run_command, data_dir, detected_boards):
         assert run_command(["upload", sketch_path])
 
 
-def test_compile_and_upload_combo_sketch_with_pde_extension(run_command, data_dir, detected_boards, wait_for_board):
-    assert run_command(["update"])
-
-    sketch_name = "CompileAndUploadPdeSketch"
-    sketch_path = Path(data_dir, sketch_name)
-
-    # Create a test sketch
-    assert run_command(["sketch", "new", sketch_path])
-
-    # Renames sketch file to pde
-    sketch_file = Path(sketch_path, f"{sketch_name}.ino").rename(sketch_path / f"{sketch_name}.pde")
-
-    for board in detected_boards:
-        # Install core
-        core = ":".join(board.fqbn.split(":")[:2])
-        assert run_command(["core", "install", core])
-
-        # Build sketch and upload from folder
-        wait_for_board()
-        res = run_command(["compile", "--clean", "-b", board.fqbn, "-u", "-p", board.address, sketch_path])
-        assert res.ok
-        assert "Sketches with .pde extension are deprecated, please rename the following files to .ino" in res.stderr
-        assert str(sketch_file) in res.stderr
-
-        # Build sketch and upload from file
-        wait_for_board()
-        res = run_command(["compile", "--clean", "-b", board.fqbn, "-u", "-p", board.address, sketch_file])
-        assert res.ok
-        assert "Sketches with .pde extension are deprecated, please rename the following files to .ino" in res.stderr
-        assert str(sketch_file) in res.stderr
-
-
 def test_upload_sketch_with_pde_extension(run_command, data_dir, detected_boards, wait_for_board):
     assert run_command(["update"])