github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3587 from dchen1107/image

Browse Source 
Clean up Kubernetes PullPolicy
This commit is contained in:
Brian Grant
2015-01-20 17:18:26 -08:00
parent 2d2374c5d3 92ff4cd2b1
commit dd45246150
7 changed files with 82 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/kubelet_test.go
View File

@@ -487,7 +487,7 @@ func TestSyncPodsCreatesNetAndContainerPullsImage(t *testing.T) {
},
Spec: api.PodSpec{
Containers: []api.Container{
{Name: "bar"},
{Name: "bar", Image: "something", ImagePullPolicy: "PullIfNotPresent"},
},
},
},
@@ -502,7 +502,7 @@ func TestSyncPodsCreatesNetAndContainerPullsImage(t *testing.T) {
fakeDocker.Lock()
if !reflect.DeepEqual(puller.ImagesPulled, []string{"custom_image_name", ""}) {
if !reflect.DeepEqual(puller.ImagesPulled, []string{"custom_image_name", "something"}) {
t.Errorf("Unexpected pulled containers: %v", puller.ImagesPulled)
}
@@ -1924,7 +1924,7 @@ func TestSyncPodsWithPullPolicy(t *testing.T) {
fakeDocker.Lock()
if !reflect.DeepEqual(puller.ImagesPulled, []string{"custom_image_name", "pull_always_image", "pull_if_not_present_image", "want:latest"}) {
if !reflect.DeepEqual(puller.ImagesPulled, []string{"custom_image_name", "pull_always_image", "pull_if_not_present_image"}) {
t.Errorf("Unexpected pulled containers: %v", puller.ImagesPulled)
}