docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX #3040 Slow test 

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot 2016-02-11 13:31:36 -08:00
parent 4262a8fde5
commit 8345672b18
3 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commands/commands_test.go
View File

@ -13,11 +13,17 @@ import (
"github.com/docker/machine/libmachine/host" "github.com/docker/machine/libmachine/host"
"github.com/docker/machine/libmachine/hosttest" "github.com/docker/machine/libmachine/hosttest"
"github.com/docker/machine/libmachine/mcnerror" "github.com/docker/machine/libmachine/mcnerror"
"github.com/docker/machine/libmachine/provision"
"github.com/docker/machine/libmachine/state" "github.com/docker/machine/libmachine/state"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
func TestRunActionForeachMachine(t *testing.T) { 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 // Assume a bunch of machines in randomly started or
// stopped states. // stopped states.
machines := []*host.Host{ machines := []*host.Host{

31
libmachine/host/host_test.go
View File

@ -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) { func TestStart(t *testing.T) {
defer provision.SetDetector(&provision.StandardDetector{})
provision.SetDetector(&provision.FakeDetector{ provision.SetDetector(&provision.FakeDetector{
Provisioner: NewNetstatProvisioner(), Provisioner: provision.NewNetstatProvisioner(),
}) })
host := &Host{ host := &Host{

28
libmachine/provision/fake_provisioner.go
View File

@ -76,3 +76,31 @@ func (fp *FakeProvisioner) SetOsReleaseInfo(info *OsRelease) {}
func (fp *FakeProvisioner) GetOsReleaseInfo() (*OsRelease, error) { func (fp *FakeProvisioner) GetOsReleaseInfo() (*OsRelease, error) {
return nil, nil 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{},
}
}