From 8f266af060185d92978921ba6503d578c6a642e4 Mon Sep 17 00:00:00 2001 From: Christian Haeusler Date: Tue, 6 Nov 2018 14:32:39 +0100 Subject: [PATCH] Assert call details in docker remove image tests --- pkg/kubelet/dockershim/docker_image_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/dockershim/docker_image_test.go b/pkg/kubelet/dockershim/docker_image_test.go index 51363cab4bf..8b967a2d5f1 100644 --- a/pkg/kubelet/dockershim/docker_image_test.go +++ b/pkg/kubelet/dockershim/docker_image_test.go @@ -34,8 +34,9 @@ func TestRemoveImage(t *testing.T) { id := "1111" fakeDocker.InjectImageInspects([]dockertypes.ImageInspect{{ID: id, RepoTags: []string{"foo"}}}) ds.RemoveImage(getTestCTX(), &runtimeapi.RemoveImageRequest{Image: &runtimeapi.ImageSpec{Image: id}}) - fakeDocker.AssertCallDetails(libdocker.NewCalledDetail("inspect_image", nil), + err := fakeDocker.AssertCallDetails(libdocker.NewCalledDetail("inspect_image", nil), libdocker.NewCalledDetail("remove_image", []interface{}{id, dockertypes.ImageRemoveOptions{PruneChildren: true}})) + assert.NoError(t, err) } func TestRemoveImageWithMultipleTags(t *testing.T) { @@ -43,9 +44,10 @@ func TestRemoveImageWithMultipleTags(t *testing.T) { id := "1111" fakeDocker.InjectImageInspects([]dockertypes.ImageInspect{{ID: id, RepoTags: []string{"foo", "bar"}}}) ds.RemoveImage(getTestCTX(), &runtimeapi.RemoveImageRequest{Image: &runtimeapi.ImageSpec{Image: id}}) - fakeDocker.AssertCallDetails(libdocker.NewCalledDetail("inspect_image", nil), + err := fakeDocker.AssertCallDetails(libdocker.NewCalledDetail("inspect_image", nil), libdocker.NewCalledDetail("remove_image", []interface{}{"foo", dockertypes.ImageRemoveOptions{PruneChildren: true}}), libdocker.NewCalledDetail("remove_image", []interface{}{"bar", dockertypes.ImageRemoveOptions{PruneChildren: true}})) + assert.NoError(t, err) } func TestPullWithJSONError(t *testing.T) {