From 8345672b18cb04106003841d02888123c79903e9 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Thu, 11 Feb 2016 13:31:36 -0800 Subject: [PATCH] FIX #3040 Slow test Signed-off-by: David Gageot --- commands/commands_test.go | 6 +++++ libmachine/host/host_test.go | 31 ++---------------------- libmachine/provision/fake_provisioner.go | 28 +++++++++++++++++++++ 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/commands/commands_test.go b/commands/commands_test.go index 42f647c0d4..4b87101939 100644 --- a/commands/commands_test.go +++ b/commands/commands_test.go @@ -13,11 +13,17 @@ import ( "github.com/docker/machine/libmachine/host" "github.com/docker/machine/libmachine/hosttest" "github.com/docker/machine/libmachine/mcnerror" + "github.com/docker/machine/libmachine/provision" "github.com/docker/machine/libmachine/state" "github.com/stretchr/testify/assert" ) func TestRunActionForeachMachine(t *testing.T) { + defer provision.SetDetector(&provision.StandardDetector{}) + provision.SetDetector(&provision.FakeDetector{ + Provisioner: provision.NewNetstatProvisioner(), + }) + // Assume a bunch of machines in randomly started or // stopped states. machines := []*host.Host{ diff --git a/libmachine/host/host_test.go b/libmachine/host/host_test.go index dc9643af4e..a418506ecf 100644 --- a/libmachine/host/host_test.go +++ b/libmachine/host/host_test.go @@ -39,37 +39,10 @@ func TestValidateHostnameInvalid(t *testing.T) { } } -type NetstatProvisioner struct { - *provision.FakeProvisioner -} - -func (p *NetstatProvisioner) SSHCommand(args string) (string, error) { - return `Active Internet connections (servers and established) -Proto Recv-Q Send-Q Local Address Foreign Address State -tcp 0 0 0.0.0.0:ssh 0.0.0.0:* LISTEN -tcp 0 72 192.168.25.141:ssh 192.168.25.1:63235 ESTABLISHED -tcp 0 0 :::2376 :::* LISTEN -tcp 0 0 :::ssh :::* LISTEN -Active UNIX domain sockets (servers and established) -Proto RefCnt Flags Type State I-Node Path -unix 2 [ ACC ] STREAM LISTENING 17990 /var/run/acpid.socket -unix 2 [ ACC ] SEQPACKET LISTENING 14233 /run/udev/control -unix 2 [ ACC ] STREAM LISTENING 19365 /var/run/docker.sock -unix 3 [ ] STREAM CONNECTED 19774 -unix 3 [ ] STREAM CONNECTED 19775 -unix 3 [ ] DGRAM 14243 -unix 3 [ ] DGRAM 14242`, nil -} - -func NewNetstatProvisioner() provision.Provisioner { - return &NetstatProvisioner{ - &provision.FakeProvisioner{}, - } -} - func TestStart(t *testing.T) { + defer provision.SetDetector(&provision.StandardDetector{}) provision.SetDetector(&provision.FakeDetector{ - Provisioner: NewNetstatProvisioner(), + Provisioner: provision.NewNetstatProvisioner(), }) host := &Host{ diff --git a/libmachine/provision/fake_provisioner.go b/libmachine/provision/fake_provisioner.go index 2fbdb5cebd..50e30c2b47 100644 --- a/libmachine/provision/fake_provisioner.go +++ b/libmachine/provision/fake_provisioner.go @@ -76,3 +76,31 @@ func (fp *FakeProvisioner) SetOsReleaseInfo(info *OsRelease) {} func (fp *FakeProvisioner) GetOsReleaseInfo() (*OsRelease, error) { return nil, nil } + +type NetstatProvisioner struct { + *FakeProvisioner +} + +func (p *NetstatProvisioner) SSHCommand(args string) (string, error) { + return `Active Internet connections (servers and established) +Proto Recv-Q Send-Q Local Address Foreign Address State +tcp 0 0 0.0.0.0:ssh 0.0.0.0:* LISTEN +tcp 0 72 192.168.25.141:ssh 192.168.25.1:63235 ESTABLISHED +tcp 0 0 :::2376 :::* LISTEN +tcp 0 0 :::ssh :::* LISTEN +Active UNIX domain sockets (servers and established) +Proto RefCnt Flags Type State I-Node Path +unix 2 [ ACC ] STREAM LISTENING 17990 /var/run/acpid.socket +unix 2 [ ACC ] SEQPACKET LISTENING 14233 /run/udev/control +unix 2 [ ACC ] STREAM LISTENING 19365 /var/run/docker.sock +unix 3 [ ] STREAM CONNECTED 19774 +unix 3 [ ] STREAM CONNECTED 19775 +unix 3 [ ] DGRAM 14243 +unix 3 [ ] DGRAM 14242`, nil +} + +func NewNetstatProvisioner() Provisioner { + return &NetstatProvisioner{ + &FakeProvisioner{}, + } +}