pluggable discovery: Fixed timeout for LIST to 2 seconds

Author: cmaglie

arduino/discovery/discovery.go

@@ -37,7 +37,6 @@ type Discovery struct {
 	out     io.ReadCloser
 	outJSON *json.Decoder
 	cmd     *exec.Cmd
-	Timeout time.Duration
 }
 
 // BoardPort is a generic port descriptor
@@ -61,9 +60,7 @@ func NewFromCommandLine(args ...string) (*Discovery, error) {
 	if err != nil {
 		return nil, fmt.Errorf("creating discovery process: %s", err)
 	}
-	disc := &Discovery{Timeout: time.Second}
-	disc.cmd = cmd
-	return disc, nil
+	return &Discovery{cmd: cmd}, nil
 }
 
 // Start starts the specified discovery
@@ -96,7 +93,7 @@ func (d *Discovery) List() ([]*BoardPort, error) {
 	go func() {
 		select {
 		case <-done:
-		case <-time.After(d.Timeout):
+		case <-time.After(2000 * time.Millisecond):
 			timeout = true
 			d.Close()
 		}