k3s-io
/
k3s
mirror of https://github.com/k3s-io/k3s.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tests.

pull/6/head
Brendan Burns 2014-06-09 16:50:44 -07:00
parent 62f6291377
commit d83f407e43
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/kubelet_server_test.go
View File

@ -16,14 +16,14 @@ import (
type fakeKubelet struct {
infoFunc func(name string) (string, error)
idFunc func(name string) (string, error)
idFunc func(name string) (string, bool, error)
}
func (fk *fakeKubelet) GetContainerInfo(name string) (string, error) {
return fk.infoFunc(name)
}
func (fk *fakeKubelet) GetContainerID(name string) (string, error) {
func (fk *fakeKubelet) GetContainerID(name string) (string, bool, error) {
return fk.idFunc(name)
}
@ -105,11 +105,11 @@ func TestContainer(t *testing.T) {
func TestContainerInfo(t *testing.T) {
fw := makeServerTest()
expected := "good container info string"
fw.fakeKubelet.idFunc = func(name string) (string, error) {
fw.fakeKubelet.idFunc = func(name string) (string, bool, error) {
if name == "goodcontainer" {
return name, nil
return name, true, nil
}
return "", fmt.Errorf("bad container")
return "", false, fmt.Errorf("bad container")
}
fw.fakeKubelet.infoFunc = func(name string) (string, error) {
if name == "goodcontainer" {

17
pkg/kubelet/kubelet_test.go
View File

@ -150,6 +150,12 @@ func verifyPackUnpack(t *testing.T, manifestId, containerName string) {
}
}
func verifyBoolean(t *testing.T, expected, value bool) {
if expected != value {
t.Errorf("Unexpected boolean. Expected %s. Found %s", expected, value)
}
}
func TestContainerManifestNaming(t *testing.T) {
verifyPackUnpack(t, "manifest1234", "container5678")
verifyPackUnpack(t, "manifest--", "container__")
@ -211,20 +217,23 @@ func TestGetContainerID(t *testing.T) {
},
}
id, err := kubelet.GetContainerID("foo")
id, found, err := kubelet.GetContainerID("foo")
verifyBoolean(t, true, found)
verifyStringEquals(t, id, "1234")
verifyNoError(t, err)
verifyCalls(t, fakeDocker, []string{"list"})
fakeDocker.clearCalls()
id, err = kubelet.GetContainerID("bar")
id, found, err = kubelet.GetContainerID("bar")
verifyBoolean(t, true, found)
verifyStringEquals(t, id, "4567")
verifyNoError(t, err)
verifyCalls(t, fakeDocker, []string{"list"})
fakeDocker.clearCalls()
id, err = kubelet.GetContainerID("NotFound")
verifyError(t, err)
id, found, err = kubelet.GetContainerID("NotFound")
verifyBoolean(t, false, found)
verifyNoError(t, err)
verifyCalls(t, fakeDocker, []string{"list"})
}