Browse code
fix tests
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Victor Vieux authored on 2014/03/18 04:17:40Showing 2 changed files
| ... | ... |
@@ -1062,7 +1062,7 @@ func TestContainerOrphaning(t *testing.T) {
|
| 1062 | 1062 |
|
| 1063 | 1063 |
// remove the second image by name |
| 1064 | 1064 |
resp := engine.NewTable("", 0)
|
| 1065 |
- if err := srv.DeleteImage(imageName, resp, true, false); err == nil {
|
|
| 1065 |
+ if err := srv.DeleteImage(imageName, resp, true, false, false); err == nil {
|
|
| 1066 | 1066 |
t.Fatal("Expected error, got none")
|
| 1067 | 1067 |
} |
| 1068 | 1068 |
|
| ... | ... |
@@ -36,7 +36,7 @@ func TestImageTagImageDelete(t *testing.T) {
|
| 36 | 36 |
t.Errorf("Expected %d images, %d found", nExpected, nActual)
|
| 37 | 37 |
} |
| 38 | 38 |
|
| 39 |
- if err := srv.DeleteImage("utest/docker:tag2", engine.NewTable("", 0), true, false); err != nil {
|
|
| 39 |
+ if err := srv.DeleteImage("utest/docker:tag2", engine.NewTable("", 0), true, false, false); err != nil {
|
|
| 40 | 40 |
t.Fatal(err) |
| 41 | 41 |
} |
| 42 | 42 |
|
| ... | ... |
@@ -48,7 +48,7 @@ func TestImageTagImageDelete(t *testing.T) {
|
| 48 | 48 |
t.Errorf("Expected %d images, %d found", nExpected, nActual)
|
| 49 | 49 |
} |
| 50 | 50 |
|
| 51 |
- if err := srv.DeleteImage("utest:5000/docker:tag3", engine.NewTable("", 0), true, false); err != nil {
|
|
| 51 |
+ if err := srv.DeleteImage("utest:5000/docker:tag3", engine.NewTable("", 0), true, false, false); err != nil {
|
|
| 52 | 52 |
t.Fatal(err) |
| 53 | 53 |
} |
| 54 | 54 |
|
| ... | ... |
@@ -57,7 +57,7 @@ func TestImageTagImageDelete(t *testing.T) {
|
| 57 | 57 |
nExpected = len(initialImages.Data[0].GetList("RepoTags")) + 1
|
| 58 | 58 |
nActual = len(images.Data[0].GetList("RepoTags"))
|
| 59 | 59 |
|
| 60 |
- if err := srv.DeleteImage("utest:tag1", engine.NewTable("", 0), true, false); err != nil {
|
|
| 60 |
+ if err := srv.DeleteImage("utest:tag1", engine.NewTable("", 0), true, false, false); err != nil {
|
|
| 61 | 61 |
t.Fatal(err) |
| 62 | 62 |
} |
| 63 | 63 |
|
| ... | ... |
@@ -579,7 +579,7 @@ func TestRmi(t *testing.T) {
|
| 579 | 579 |
t.Fatalf("Expected 2 new images, found %d.", images.Len()-initialImages.Len())
|
| 580 | 580 |
} |
| 581 | 581 |
|
| 582 |
- if err = srv.DeleteImage(imageID, engine.NewTable("", 0), true, false); err != nil {
|
|
| 582 |
+ if err = srv.DeleteImage(imageID, engine.NewTable("", 0), true, false, false); err != nil {
|
|
| 583 | 583 |
t.Fatal(err) |
| 584 | 584 |
} |
| 585 | 585 |
|
| ... | ... |
@@ -815,7 +815,7 @@ func TestDeleteTagWithExistingContainers(t *testing.T) {
|
| 815 | 815 |
|
| 816 | 816 |
// Try to remove the tag |
| 817 | 817 |
imgs := engine.NewTable("", 0)
|
| 818 |
- if err := srv.DeleteImage("utest:tag1", imgs, true, false); err != nil {
|
|
| 818 |
+ if err := srv.DeleteImage("utest:tag1", imgs, true, false, false); err != nil {
|
|
| 819 | 819 |
t.Fatal(err) |
| 820 | 820 |
} |
| 821 | 821 |
|