Make test 10s faster

Signed-off-by: David Gageot <david@gageot.net>

libmachine/drivers/plugin/localbinary/plugin.go

@@ -73,6 +73,7 @@ type Plugin struct {
 	MachineName string
 	addrCh      chan string
 	stopCh      chan bool
+	timeout     time.Duration
 }
 
 type Executor struct {
@@ -230,13 +231,17 @@ func (lbp *Plugin) Serve() error {
 
 func (lbp *Plugin) Address() (string, error) {
 	if lbp.Addr == "" {
+		if lbp.timeout == 0 {
+			lbp.timeout = defaultTimeout
+		}
+
 		select {
 		case lbp.Addr = <-lbp.addrCh:
 			log.Debugf("Plugin server listening at address %s", lbp.Addr)
 			close(lbp.addrCh)
 			return lbp.Addr, nil
-		case <-time.After(defaultTimeout):
+		case <-time.After(lbp.timeout):
-			return "", fmt.Errorf("Failed to dial the plugin server in %s", defaultTimeout)
+			return "", fmt.Errorf("Failed to dial the plugin server in %s", lbp.timeout)
 		}
 	}
 	return lbp.Addr, nil

libmachine/drivers/plugin/localbinary/plugin_test.go

@@ -10,6 +10,7 @@ import (
 	"os"
 
 	"github.com/docker/machine/libmachine/log"
+	"github.com/stretchr/testify/assert"
 )
 
 type FakeExecutor struct {
@@ -56,15 +57,16 @@ func TestLocalBinaryPluginAddressTimeout(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping timeout test")
 	}
-	lbp := &Plugin{}
+
-	lbp.addrCh = make(chan string, 1)
+	lbp := &Plugin{
-	go func() {
+		addrCh:  make(chan string, 1),
-		_, err := lbp.Address()
+		timeout: 1 * time.Second,
-		if err == nil {
-			t.Fatalf("Expected to get a timeout error, instead got %s", err)
 	}
-	}()
+
-	time.Sleep(defaultTimeout + 1)
+	addr, err := lbp.Address()
+
+	assert.Empty(t, addr)
+	assert.EqualError(t, err, "Failed to dial the plugin server in 1s")
 }
 
 func TestLocalBinaryPluginClose(t *testing.T) {