github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Set fake docker client to minimum required version.

Browse Source
This commit is contained in:
Random-Liu
2016-04-04 16:01:11 -07:00
parent ce988c8d75
commit 8fb7ee38b0
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/kubelet/dockertools/docker_test.go
View File

@@ -81,7 +81,7 @@ func findPodContainer(dockerContainers []*docker.APIContainers, podFullName stri
}
func TestGetContainerID(t *testing.T) {
fakeDocker := &FakeDockerClient{}
fakeDocker := NewFakeDockerClient()
fakeDocker.SetFakeRunningContainers([]*docker.Container{
{
ID: "foobar",
@@ -156,7 +156,7 @@ func TestContainerNaming(t *testing.T) {
}
func TestVersion(t *testing.T) {
fakeDocker := &FakeDockerClient{VersionInfo: docker.Env{"Version=1.1.3", "ApiVersion=1.15"}}
fakeDocker := NewFakeDockerClientWithVersion("1.1.3", "1.15")
manager := &DockerManager{client: fakeDocker}
version, err := manager.Version()
if err != nil {
@@ -214,7 +214,7 @@ func TestPullWithNoSecrets(t *testing.T) {
}
for _, test := range tests {
fakeKeyring := &credentialprovider.FakeKeyring{}
fakeClient := &FakeDockerClient{}
fakeClient := NewFakeDockerClient()
dp := dockerPuller{
client: fakeClient,
@@ -257,9 +257,9 @@ func TestPullWithJSONError(t *testing.T) {
}
for i, test := range tests {
fakeKeyring := &credentialprovider.FakeKeyring{}
fakeClient := &FakeDockerClient{
Errors: map[string]error{"pull": test.err},
}
fakeClient := NewFakeDockerClient()
fakeClient.InjectError("pull", test.err)
puller := &dockerPuller{
client: fakeClient,
keyring: fakeKeyring,
@@ -327,7 +327,7 @@ func TestPullWithSecrets(t *testing.T) {
builtInKeyRing := &credentialprovider.BasicDockerKeyring{}
builtInKeyRing.Add(test.builtInDockerConfig)
fakeClient := &FakeDockerClient{}
fakeClient := NewFakeDockerClient()
dp := dockerPuller{
client: fakeClient,
@@ -353,9 +353,8 @@ func TestPullWithSecrets(t *testing.T) {
func TestDockerKeyringLookupFails(t *testing.T) {
fakeKeyring := &credentialprovider.FakeKeyring{}
fakeClient := &FakeDockerClient{
Errors: map[string]error{"pull": fmt.Errorf("test error")},
}
fakeClient := NewFakeDockerClient()
fakeClient.InjectError("pull", fmt.Errorf("test error"))
dp := dockerPuller{
client: fakeClient,
@@ -493,7 +492,7 @@ func (f *imageTrackingDockerClient) InspectImage(name string) (image *docker.Ima
}
func TestIsImagePresent(t *testing.T) {
cl := &imageTrackingDockerClient{&FakeDockerClient{}, ""}
cl := &imageTrackingDockerClient{NewFakeDockerClient(), ""}
puller := &dockerPuller{
client: cl,
}
@@ -671,7 +670,7 @@ func TestFindContainersByPod(t *testing.T) {
nil,
},
}
fakeClient := &FakeDockerClient{}
fakeClient := NewFakeDockerClient()
np, _ := network.InitNetworkPlugin([]network.NetworkPlugin{}, "", nettest.NewFakeHost(nil))
// image back-off is set to nil, this test should not pull images
containerManager := NewFakeDockerManager(fakeClient, &record.FakeRecorder{}, nil, nil, &cadvisorapi.MachineInfo{}, options.GetDefaultPodInfraContainerImage(), 0, 0, "", containertest.FakeOS{}, np, nil, nil, nil)