Merge branch 'arduino:master' into master

Author: bmitov

arduino/discovery/discovery_client/go.sum

@@ -14,6 +14,8 @@ github.com/arduino/go-paths-helper v1.6.0 h1:S7/d7DqB9XlnvF9KrgSiGmo2oWKmYW6O/DT
 github.com/arduino/go-paths-helper v1.6.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU=
 github.com/arduino/go-properties-orderedmap v1.3.0 h1:4No/vQopB36e7WUIk6H6TxiSEJPiMrVOCZylYmua39o=
 github.com/arduino/go-properties-orderedmap v1.3.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
+github.com/arduino/go-properties-orderedmap v1.5.0 h1:istmr13qQN3nneuU3lsqlMvI6jqB3u8QUfVU1tX/t/8=
+github.com/arduino/go-properties-orderedmap v1.5.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b/go.mod h1:uwGy5PpN4lqW97FiLnbcx+xx8jly5YuPMJWfVwwjJiQ=
 github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b/go.mod h1:iIPnclBMYm1g32Q5kXoqng4jLhMStReIP7ZxaoUC2y8=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=

arduino/discovery/discovery_client/main.go

@@ -37,7 +37,7 @@ func main() {
 			log.Fatal("Error initializing discovery:", err)
 		}
 
-		if err := disc.Hello(); err != nil {
+		if err := disc.Run(); err != nil {
 			log.Fatal("Error starting discovery:", err)
 		}
 		if err := disc.Start(); err != nil {

arduino/serialutils/serialutils.go

@@ -17,6 +17,7 @@ package serialutils
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/pkg/errors"
@@ -86,9 +87,28 @@ type ResetProgressCallbacks struct {
 // If wait is true, this function will wait for a new port to appear and returns that
 // one, otherwise the empty string is returned if the new port can not be detected or
 // if the wait parameter is false.
+// If dryRun is set to true this function will only emulate the port reset without actually
+// performing it, this is useful to mockup for unit-testing and CI.
+// In dryRun mode if the `portToTouch` ends with `"999"` and wait is true, Reset will
+// return a new "bootloader" port as `portToTouch+"0"`.
 // The error is set if the port listing fails.
-func Reset(portToTouch string, wait bool, cb *ResetProgressCallbacks) (string, error) {
-	last, err := getPortMap()
+func Reset(portToTouch string, wait bool, cb *ResetProgressCallbacks, dryRun bool) (string, error) {
+	getPorts := getPortMap // non dry-run default
+	if dryRun {
+		emulatedPort := portToTouch
+		getPorts = func() (map[string]bool, error) {
+			res := map[string]bool{}
+			if emulatedPort != "" {
+				res[emulatedPort] = true
+			}
+			if strings.HasSuffix(emulatedPort, "999") {
+				emulatedPort += "0"
+			}
+			return res, nil
+		}
+	}
+
+	last, err := getPorts()
 	if cb != nil && cb.Debug != nil {
 		cb.Debug(fmt.Sprintf("LAST: %v", last))
 	}
@@ -103,8 +123,12 @@ func Reset(portToTouch string, wait bool, cb *ResetProgressCallbacks) (string, e
 		if cb != nil && cb.TouchingPort != nil {
 			cb.TouchingPort(portToTouch)
 		}
-		if err := TouchSerialPortAt1200bps(portToTouch); err != nil {
-			fmt.Println("TOUCH: error during reset:", err)
+		if dryRun {
+			// do nothing!
+		} else {
+			if err := TouchSerialPortAt1200bps(portToTouch); err != nil {
+				fmt.Println("TOUCH: error during reset:", err)
+			}
 		}
 	}
 
@@ -116,8 +140,12 @@ func Reset(portToTouch string, wait bool, cb *ResetProgressCallbacks) (string, e
 	}
 
 	deadline := time.Now().Add(10 * time.Second)
+	if dryRun {
+		// use a much lower timeout in dryRun
+		deadline = time.Now().Add(100 * time.Millisecond)
+	}
 	for time.Now().Before(deadline) {
-		now, err := getPortMap()
+		now, err := getPorts()
 		if err != nil {
 			return "", err
 		}
@@ -146,7 +174,7 @@ func Reset(portToTouch string, wait bool, cb *ResetProgressCallbacks) (string, e
 			// the USB serial port appearing and disappearing rapidly before
 			// settling.
 			// This check ensure that the port is stable after one second.
-			check, err := getPortMap()
+			check, err := getPorts()
 			if err != nil {
 				return "", err
 			}

cli/burnbootloader/burnbootloader.go

@@ -33,6 +33,7 @@ var (
 	verbose    bool
 	verify     bool
 	programmer string
+	dryRun     bool
 )
 
 // NewCommand created a new `burn-bootloader` command
@@ -51,6 +52,8 @@ func NewCommand() *cobra.Command {
 	burnBootloaderCommand.Flags().BoolVarP(&verify, "verify", "t", false, "Verify uploaded binary after the upload.")
 	burnBootloaderCommand.Flags().BoolVarP(&verbose, "verbose", "v", false, "Turns on verbose mode.")
 	burnBootloaderCommand.Flags().StringVarP(&programmer, "programmer", "P", "", "Use the specified programmer to upload.")
+	burnBootloaderCommand.Flags().BoolVar(&dryRun, "dry-run", false, "Do not perform the actual upload, just log out actions")
+	burnBootloaderCommand.Flags().MarkHidden("dry-run")
 
 	return burnBootloaderCommand
 }
@@ -65,6 +68,7 @@ func run(command *cobra.Command, args []string) {
 		Verbose:    verbose,
 		Verify:     verify,
 		Programmer: programmer,
+		DryRun:     dryRun,
 	}, os.Stdout, os.Stderr); err != nil {
 		feedback.Errorf("Error during Upload: %v", err)
 		os.Exit(errorcodes.ErrGeneric)

cli/upload/upload.go

@@ -38,6 +38,7 @@ var (
 	importDir  string
 	importFile string
 	programmer string
+	dryRun     bool
 )
 
 // NewCommand created a new `upload` command
@@ -59,7 +60,8 @@ func NewCommand() *cobra.Command {
 	uploadCommand.Flags().BoolVarP(&verify, "verify", "t", false, "Verify uploaded binary after the upload.")
 	uploadCommand.Flags().BoolVarP(&verbose, "verbose", "v", false, "Optional, turns on verbose mode.")
 	uploadCommand.Flags().StringVarP(&programmer, "programmer", "P", "", "Optional, use the specified programmer to upload.")
-
+	uploadCommand.Flags().BoolVar(&dryRun, "dry-run", false, "Do not perform the actual upload, just log out actions")
+	uploadCommand.Flags().MarkHidden("dry-run")
 	return uploadCommand
 }
 
@@ -97,6 +99,7 @@ func run(command *cobra.Command, args []string) {
 		ImportFile: importFile,
 		ImportDir:  importDir,
 		Programmer: programmer,
+		DryRun:     dryRun,
 	}, os.Stdout, os.Stderr); err != nil {
 		feedback.Errorf("Error during Upload: %v", err)
 		os.Exit(errorcodes.ErrGeneric)

client_example/go.mod

@@ -6,5 +6,5 @@ replace github.com/arduino/arduino-cli => ../
 
 require (
 	github.com/arduino/arduino-cli v0.0.0-20200109150215-ffa84fdaab21
-	google.golang.org/grpc v1.27.0
+	google.golang.org/grpc v1.37.0
 )