Added test for upload without port

Author: cmaglie

commands/upload/testdata/hardware/alice/avr/boards.txt

@@ -11,3 +11,20 @@ board1.bootloader.extended_fuses=0xFD
 board1.bootloader.unlock_bits=0x3F
 board1.bootloader.lock_bits=0x0F
 board1.bootloader.file=optiboot/optiboot_atmega328.hex
+
+
+board2.name=board2
+board2.conf.board=conf-board1
+board2.upload.tool=one-noport
+board2.upload.protocol=protocol
+board2.upload.speed=speed
+
+board2.bootloader.tool=one
+board2.bootloader.low_fuses=0xFF
+board2.bootloader.high_fuses=0xDE
+board2.bootloader.extended_fuses=0xFD
+board2.bootloader.unlock_bits=0x3F
+board2.bootloader.lock_bits=0x0F
+board2.bootloader.file=optiboot/optiboot_atmega328.hex
+
+

commands/upload/testdata/hardware/alice/avr/platform.txt

@@ -4,7 +4,6 @@ version=1.0.0
 # Upload test 1
 tools.one.cmd.path=echo
 tools.one.conf.general=conf-general
-
 tools.one.upload.conf=conf-upload
 tools.one.upload.params.verbose=verbose
 tools.one.upload.params.quiet=quiet
@@ -14,8 +13,10 @@ tools.one.upload.pattern={cmd.path} {conf.board} {conf.general} {upload.conf} {u
 
 # Upload test 2
 tools.one-noport.cmd.path=echo
+tools.one-noport.conf.general=conf-general
+tools.one-noport.upload.conf=conf-upload
 tools.one-noport.upload.params.verbose=verbose
 tools.one-noport.upload.params.quiet=quiet
-tools.one-noport.upload.verify=verify
+tools.one-noport.upload.params.verify=verify
 tools.one-noport.upload.params.noverify=noverify
-tools.one-noport.upload.pattern={cmd.path} {conf.general} {conf.upload} {upload.verbose} {upload.verify} {build.mcu} {upload.protocol} "{serial.port}" -b{upload.speed} "{build.path}/{build.project_name}.hex"
+tools.one-noport.upload.pattern={cmd.path} {conf.board} {conf.general} {upload.conf} {upload.verbose} {upload.verify} {upload.protocol} -b{upload.speed} "{build.path}/{build.project_name}.hex"

commands/upload/upload_test.go

@@ -141,6 +141,10 @@ func TestUploadPropertiesComposition(t *testing.T) {
 	tests := []test{
 		// classic upload, requires port
 		{buildPath1, "alice:avr:board1", "port", "", false, "conf-board1 conf-general conf-upload $$VERBOSE-VERIFY$$ protocol port -bspeed testdata/build_path_1/sketch.ino.hex"},
+		{buildPath1, "alice:avr:board1", "", "", false, "FAIL"},
+		// classic upload, no port
+		{buildPath1, "alice:avr:board2", "port", "", false, "conf-board1 conf-general conf-upload $$VERBOSE-VERIFY$$ protocol -bspeed testdata/build_path_1/sketch.ino.hex"},
+		{buildPath1, "alice:avr:board2", "", "", false, "conf-board1 conf-general conf-upload $$VERBOSE-VERIFY$$ protocol -bspeed testdata/build_path_1/sketch.ino.hex"},
 	}
 	for i, test := range tests {
 		t.Run(fmt.Sprintf("SubTest%02d", i), func(t *testing.T) {
@@ -160,9 +164,13 @@ func TestUploadPropertiesComposition(t *testing.T) {
 				outStream,
 				errStream,
 			)
-			require.NoError(t, err)
-			out := strings.TrimSpace(outStream.String())
-			require.Equal(t, strings.ReplaceAll(test.expected, "$$VERBOSE-VERIFY$$", "quiet noverify"), out)
+			if test.expected == "FAIL" {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+				out := strings.TrimSpace(outStream.String())
+				require.Equal(t, strings.ReplaceAll(test.expected, "$$VERBOSE-VERIFY$$", "quiet noverify"), out)
+			}
 		})
 		t.Run(fmt.Sprintf("SubTest%02d-WithVerifyAndVerbose", i), func(t *testing.T) {
 			outStream := &bytes.Buffer{}
@@ -181,15 +189,19 @@ func TestUploadPropertiesComposition(t *testing.T) {
 				outStream,
 				errStream,
 			)
-			require.NoError(t, err)
-			out := strings.Split(outStream.String(), "\n")
-			// With verbose enabled, the upload will output 3 lines:
-			// - the command line that the cli is going to run
-			// - the output of the command
-			// - an empty line
-			// we are interested in the second line
-			require.Len(t, out, 3)
-			require.Equal(t, strings.ReplaceAll(test.expected, "$$VERBOSE-VERIFY$$", "verbose verify"), out[1])
+			if test.expected == "FAIL" {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+				out := strings.Split(outStream.String(), "\n")
+				// With verbose enabled, the upload will output 3 lines:
+				// - the command line that the cli is going to run
+				// - the output of the command
+				// - an empty line
+				// we are interested in the second line
+				require.Len(t, out, 3)
+				require.Equal(t, strings.ReplaceAll(test.expected, "$$VERBOSE-VERIFY$$", "verbose verify"), out[1])
+			}
 		})
 	}
 }