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

updated tests 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-01-15 14:37:24 -05:00
parent 090e3328c8
commit 0c8ef0abe5
4 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
commands_test.go
View File

@ -61,6 +61,18 @@ func (d *FakeDriver) Upgrade() error {
return nil return nil
} }
func (d *FakeDriver) StartDocker() error {
return nil
}
func (d *FakeDriver) StopDocker() error {
return nil
}
func (d *FakeDriver) GetDockerConfigDir() string {
return ""
}
func (d *FakeDriver) GetSSHCommand(args ...string) (*exec.Cmd, error) { func (d *FakeDriver) GetSSHCommand(args ...string) (*exec.Cmd, error) {
return &exec.Cmd{}, nil return &exec.Cmd{}, nil
} }
@ -71,7 +83,7 @@ func TestGetHostState(t *testing.T) {
t.Fatal("Error creating tmp dir:", err) t.Fatal("Error creating tmp dir:", err)
} }
hostListItems := make(chan hostListItem) hostListItems := make(chan hostListItem)
store := NewStore(storePath) store := NewStore(storePath, "", "")
hosts := []Host{ hosts := []Host{
{ {
Name: "foo", Name: "foo",

8
drivers/drivers_test.go
View File

@ -8,7 +8,9 @@ import (
func TestGetCreateFlags(t *testing.T) { func TestGetCreateFlags(t *testing.T) {
Register("foo", &RegisteredDriver{ Register("foo", &RegisteredDriver{
New: func(machineName string, storePath string) (Driver, error) { return nil, nil }, New: func(machineName string, storePath string, caCert string, privateKey string) (Driver, error) {
return nil, nil
},
GetCreateFlags: func() []cli.Flag { GetCreateFlags: func() []cli.Flag {
return []cli.Flag{ return []cli.Flag{
cli.StringFlag{ cli.StringFlag{
@ -33,7 +35,9 @@ func TestGetCreateFlags(t *testing.T) {
}, },
}) })
Register("bar", &RegisteredDriver{ Register("bar", &RegisteredDriver{
New: func(machineName string, storePath string) (Driver, error) { return nil, nil }, New: func(machineName string, storePath string, caCert string, privateKey string) (Driver, error) {
return nil, nil
},
GetCreateFlags: func() []cli.Flag { GetCreateFlags: func() []cli.Flag {
return []cli.Flag{ return []cli.Flag{
cli.StringFlag{ cli.StringFlag{

4
host.go
View File

@ -142,6 +142,10 @@ func (h *Host) GenerateCertificates(serverIPs []string) error {
func (h *Host) ConfigureAuth() error { func (h *Host) ConfigureAuth() error {
d := h.Driver d := h.Driver
if d.DriverName() == "none" {
return nil
}
ip, err := d.GetIP() ip, err := d.GetIP()
if err != nil { if err != nil {
return err return err

14
store_test.go
View File

@ -41,7 +41,7 @@ func TestStoreCreate(t *testing.T) {
}, },
} }
store := NewStore("") store := NewStore("", "", "")
host, err := store.Create("test", "none", flags) host, err := store.Create("test", "none", flags)
if err != nil { if err != nil {
@ -67,7 +67,7 @@ func TestStoreRemove(t *testing.T) {
}, },
} }
store := NewStore("") store := NewStore("", "", "")
_, err := store.Create("test", "none", flags) _, err := store.Create("test", "none", flags)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -96,7 +96,7 @@ func TestStoreList(t *testing.T) {
}, },
} }
store := NewStore("") store := NewStore("", "", "")
_, err := store.Create("test", "none", flags) _, err := store.Create("test", "none", flags)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -121,7 +121,7 @@ func TestStoreExists(t *testing.T) {
}, },
} }
store := NewStore("") store := NewStore("", "", "")
exists, err := store.Exists("test") exists, err := store.Exists("test")
if exists { if exists {
t.Fatal("Exists returned true when it should have been false") t.Fatal("Exists returned true when it should have been false")
@ -151,13 +151,13 @@ func TestStoreLoad(t *testing.T) {
}, },
} }
store := NewStore("") store := NewStore("", "", "")
_, err := store.Create("test", "none", flags) _, err := store.Create("test", "none", flags)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
store = NewStore("") store = NewStore("", "", "")
host, err := store.Load("test") host, err := store.Load("test")
if host.Name != "test" { if host.Name != "test" {
t.Fatal("Host name is incorrect") t.Fatal("Host name is incorrect")
@ -182,7 +182,7 @@ func TestStoreGetSetActive(t *testing.T) {
}, },
} }
store := NewStore("") store := NewStore("", "", "")
// No hosts set // No hosts set
host, err := store.GetActive() host, err := store.GetActive()