From 2f4b69fe2bc165dbd8b03db4daf19e4d99813cb3 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 17 Mar 2014 19:17:40 +0000 Subject: [PATCH] fix tests Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) Upstream-commit: 326f6a4b4d942bf75ecb003e5c0d439bcb9d67cf Component: engine --- components/engine/integration/commands_test.go | 2 +- components/engine/integration/server_test.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/engine/integration/commands_test.go b/components/engine/integration/commands_test.go index dba15842c7..5804d9f351 100644 --- a/components/engine/integration/commands_test.go +++ b/components/engine/integration/commands_test.go @@ -1062,7 +1062,7 @@ func TestContainerOrphaning(t *testing.T) { // remove the second image by name resp := engine.NewTable("", 0) - if err := srv.DeleteImage(imageName, resp, true, false); err == nil { + if err := srv.DeleteImage(imageName, resp, true, false, false); err == nil { t.Fatal("Expected error, got none") } diff --git a/components/engine/integration/server_test.go b/components/engine/integration/server_test.go index 2455c766e3..a401f1306e 100644 --- a/components/engine/integration/server_test.go +++ b/components/engine/integration/server_test.go @@ -36,7 +36,7 @@ func TestImageTagImageDelete(t *testing.T) { t.Errorf("Expected %d images, %d found", nExpected, nActual) } - if err := srv.DeleteImage("utest/docker:tag2", engine.NewTable("", 0), true, false); err != nil { + if err := srv.DeleteImage("utest/docker:tag2", engine.NewTable("", 0), true, false, false); err != nil { t.Fatal(err) } @@ -48,7 +48,7 @@ func TestImageTagImageDelete(t *testing.T) { t.Errorf("Expected %d images, %d found", nExpected, nActual) } - if err := srv.DeleteImage("utest:5000/docker:tag3", engine.NewTable("", 0), true, false); err != nil { + if err := srv.DeleteImage("utest:5000/docker:tag3", engine.NewTable("", 0), true, false, false); err != nil { t.Fatal(err) } @@ -57,7 +57,7 @@ func TestImageTagImageDelete(t *testing.T) { nExpected = len(initialImages.Data[0].GetList("RepoTags")) + 1 nActual = len(images.Data[0].GetList("RepoTags")) - if err := srv.DeleteImage("utest:tag1", engine.NewTable("", 0), true, false); err != nil { + if err := srv.DeleteImage("utest:tag1", engine.NewTable("", 0), true, false, false); err != nil { t.Fatal(err) } @@ -579,7 +579,7 @@ func TestRmi(t *testing.T) { t.Fatalf("Expected 2 new images, found %d.", images.Len()-initialImages.Len()) } - if err = srv.DeleteImage(imageID, engine.NewTable("", 0), true, false); err != nil { + if err = srv.DeleteImage(imageID, engine.NewTable("", 0), true, false, false); err != nil { t.Fatal(err) } @@ -815,7 +815,7 @@ func TestDeleteTagWithExistingContainers(t *testing.T) { // Try to remove the tag imgs := engine.NewTable("", 0) - if err := srv.DeleteImage("utest:tag1", imgs, true, false); err != nil { + if err := srv.DeleteImage("utest:tag1", imgs, true, false, false); err != nil { t.Fatal(err) }