From 85b4b4677ef6c12be98f43b61dc7be4a30182688 Mon Sep 17 00:00:00 2001 From: James DeFelice Date: Wed, 10 Dec 2014 15:33:38 -0500 Subject: [PATCH 1/2] unit test for #2815, as requested by @brendandburns --- pkg/kubelet/dockertools/docker_test.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkg/kubelet/dockertools/docker_test.go b/pkg/kubelet/dockertools/docker_test.go index dda9ae34bd5..08af9305304 100644 --- a/pkg/kubelet/dockertools/docker_test.go +++ b/pkg/kubelet/dockertools/docker_test.go @@ -264,3 +264,23 @@ func TestDockerKeyringLookup(t *testing.T) { } } } + +type imageTrackingDockerClient struct { + *FakeDockerClient + imageName string +} +func (f *imageTrackingDockerClient) InspectImage(name string) (image *docker.Image, err error) { + image, err = f.FakeDockerClient.InspectImage(name) + f.imageName = name + return +} +func TestIsImagePresent(t *testing.T) { + cl := &imageTrackingDockerClient{&FakeDockerClient{},""} + puller := &dockerPuller{ + client: cl, + } + _, _ = puller.IsImagePresent("abc:123") + if cl.imageName != "abc:123" { + t.Errorf("expected inspection of image abc:123, instead inspected image %v", cl.imageName) + } +} From 3afc9fffbad43c1d3bd14055c55d5d9892f84d7c Mon Sep 17 00:00:00 2001 From: James DeFelice Date: Fri, 12 Dec 2014 20:43:07 -0500 Subject: [PATCH 2/2] fixed minor formatting --- pkg/kubelet/dockertools/docker_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/dockertools/docker_test.go b/pkg/kubelet/dockertools/docker_test.go index 08af9305304..485a26f0ce7 100644 --- a/pkg/kubelet/dockertools/docker_test.go +++ b/pkg/kubelet/dockertools/docker_test.go @@ -269,13 +269,15 @@ type imageTrackingDockerClient struct { *FakeDockerClient imageName string } + func (f *imageTrackingDockerClient) InspectImage(name string) (image *docker.Image, err error) { image, err = f.FakeDockerClient.InspectImage(name) f.imageName = name return } + func TestIsImagePresent(t *testing.T) { - cl := &imageTrackingDockerClient{&FakeDockerClient{},""} + cl := &imageTrackingDockerClient{&FakeDockerClient{}, ""} puller := &dockerPuller{ client: cl, }