beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix tests

Browse source 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
This commit is contained in:
Victor Vieux 2014-03-17 19:17:40 +00:00
parent a18d08177c
commit 326f6a4b4d
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration/commands_test.go
View file

@ -1062,7 +1062,7 @@ func TestContainerOrphaning(t *testing.T) {
// remove the second image by name // remove the second image by name
resp := engine.NewTable("", 0) 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") t.Fatal("Expected error, got none")
} }

10
integration/server_test.go
View file

@ -36,7 +36,7 @@ func TestImageTagImageDelete(t *testing.T) {
t.Errorf("Expected %d images, %d found", nExpected, nActual) 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) t.Fatal(err)
} }
@ -48,7 +48,7 @@ func TestImageTagImageDelete(t *testing.T) {
t.Errorf("Expected %d images, %d found", nExpected, nActual) 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) t.Fatal(err)
} }
@ -57,7 +57,7 @@ func TestImageTagImageDelete(t *testing.T) {
nExpected = len(initialImages.Data[0].GetList("RepoTags")) + 1 nExpected = len(initialImages.Data[0].GetList("RepoTags")) + 1
nActual = len(images.Data[0].GetList("RepoTags")) 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) t.Fatal(err)
} }
@ -579,7 +579,7 @@ func TestRmi(t *testing.T) {
t.Fatalf("Expected 2 new images, found %d.", images.Len()-initialImages.Len()) 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) t.Fatal(err)
} }
@ -815,7 +815,7 @@ func TestDeleteTagWithExistingContainers(t *testing.T) {
// Try to remove the tag // Try to remove the tag
imgs := engine.NewTable("", 0) 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) t.Fatal(err)
} }