kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

cli integration: sync container & image deletion

Browse source 
This makes container and image removal in the tests run synchronously.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
This commit is contained in:
unclejack 2014-04-04 03:22:32 +03:00
parent 09aa28eca0
commit e09274476f
10 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
integration-cli/docker_cli_build_test.go
View file

@ -18,7 +18,7 @@ func TestBuildSixtySteps(t *testing.T) {
t.Fatal("failed to build the image") t.Fatal("failed to build the image")
} }
go deleteImages("foobuildsixtysteps") deleteImages("foobuildsixtysteps")
logDone("build - build an image with sixty build steps") logDone("build - build an image with sixty build steps")
} }

4
integration-cli/docker_cli_commit_test.go
View file

@ -27,8 +27,8 @@ func TestCommitAfterContainerIsDone(t *testing.T) {
out, _, err = runCommandWithOutput(inspectCmd) out, _, err = runCommandWithOutput(inspectCmd)
errorOut(err, t, fmt.Sprintf("failed to inspect image: %v %v", out, err)) errorOut(err, t, fmt.Sprintf("failed to inspect image: %v %v", out, err))
go deleteContainer(cleanedContainerID) deleteContainer(cleanedContainerID)
go deleteImages(cleanedImageID) deleteImages(cleanedImageID)
logDone("commit - echo foo and commit the image") logDone("commit - echo foo and commit the image")
} }

6
integration-cli/docker_cli_diff_test.go
View file

@ -30,7 +30,7 @@ func TestDiffFilenameShownInOutput(t *testing.T) {
if !found { if !found {
t.Errorf("couldn't find the new file in docker diff's output: %v", out) t.Errorf("couldn't find the new file in docker diff's output: %v", out)
} }
go deleteContainer(cleanCID) deleteContainer(cleanCID)
logDone("diff - check if created file shows up") logDone("diff - check if created file shows up")
} }
@ -53,7 +53,7 @@ func TestDiffEnsureDockerinitFilesAreIgnored(t *testing.T) {
out, _, err := runCommandWithOutput(diffCmd) out, _, err := runCommandWithOutput(diffCmd)
errorOut(err, t, fmt.Sprintf("failed to run diff: %v %v", out, err)) errorOut(err, t, fmt.Sprintf("failed to run diff: %v %v", out, err))
go deleteContainer(cleanCID) deleteContainer(cleanCID)
for _, filename := range dockerinitFiles { for _, filename := range dockerinitFiles {
if strings.Contains(out, filename) { if strings.Contains(out, filename) {
@ -74,7 +74,7 @@ func TestDiffEnsureOnlyKmsgAndPtmx(t *testing.T) {
diffCmd := exec.Command(dockerBinary, "diff", cleanCID) diffCmd := exec.Command(dockerBinary, "diff", cleanCID)
out, _, err := runCommandWithOutput(diffCmd) out, _, err := runCommandWithOutput(diffCmd)
errorOut(err, t, fmt.Sprintf("failed to run diff: %v %v", out, err)) errorOut(err, t, fmt.Sprintf("failed to run diff: %v %v", out, err))
go deleteContainer(cleanCID) deleteContainer(cleanCID)
expected := map[string]bool{ expected := map[string]bool{
"C /dev": true, "C /dev": true,

4
integration-cli/docker_cli_export_import_test.go
View file

@ -40,8 +40,8 @@ func TestExportContainerAndImportImage(t *testing.T) {
out, _, err = runCommandWithOutput(inspectCmd) out, _, err = runCommandWithOutput(inspectCmd)
errorOut(err, t, fmt.Sprintf("output should've been an image id: %v %v", out, err)) errorOut(err, t, fmt.Sprintf("output should've been an image id: %v %v", out, err))
go deleteImages("testexp") deleteContainer(cleanedContainerID)
go deleteContainer(cleanedContainerID) deleteImages("testexp")
os.Remove("/tmp/testexp.tar") os.Remove("/tmp/testexp.tar")

2
integration-cli/docker_cli_kill_test.go
View file

@ -30,7 +30,7 @@ func TestKillContainer(t *testing.T) {
t.Fatal("killed container is still running") t.Fatal("killed container is still running")
} }
go deleteContainer(cleanedContainerID) deleteContainer(cleanedContainerID)
logDone("kill - kill container running sleep 10") logDone("kill - kill container running sleep 10")
} }

6
integration-cli/docker_cli_logs_test.go
View file

@ -24,7 +24,7 @@ func TestLogsContainerSmallerThanPage(t *testing.T) {
t.Fatalf("Expected log length of %d, received %d\n", testLen+1, len(out)) t.Fatalf("Expected log length of %d, received %d\n", testLen+1, len(out))
} }
go deleteContainer(cleanedContainerID) deleteContainer(cleanedContainerID)
logDone("logs - logs container running echo smaller than page size") logDone("logs - logs container running echo smaller than page size")
} }
@ -47,7 +47,7 @@ func TestLogsContainerBiggerThanPage(t *testing.T) {
t.Fatalf("Expected log length of %d, received %d\n", testLen+1, len(out)) t.Fatalf("Expected log length of %d, received %d\n", testLen+1, len(out))
} }
go deleteContainer(cleanedContainerID) deleteContainer(cleanedContainerID)
logDone("logs - logs container running echo bigger than page size") logDone("logs - logs container running echo bigger than page size")
} }
@ -70,7 +70,7 @@ func TestLogsContainerMuchBiggerThanPage(t *testing.T) {
t.Fatalf("Expected log length of %d, received %d\n", testLen+1, len(out)) t.Fatalf("Expected log length of %d, received %d\n", testLen+1, len(out))
} }
go deleteContainer(cleanedContainerID) deleteContainer(cleanedContainerID)
logDone("logs - logs container running echo much bigger than page size") logDone("logs - logs container running echo much bigger than page size")
} }

2
integration-cli/docker_cli_push_test.go
View file

@ -26,7 +26,7 @@ func TestPushBusyboxImage(t *testing.T) {
out, exitCode, err = runCommandWithOutput(pushCmd) out, exitCode, err = runCommandWithOutput(pushCmd)
errorOut(err, t, fmt.Sprintf("%v %v", out, err)) errorOut(err, t, fmt.Sprintf("%v %v", out, err))
go deleteImages(repoName) deleteImages(repoName)
if err != nil || exitCode != 0 { if err != nil || exitCode != 0 {
t.Fatal("pushing the image to the private registry has failed") t.Fatal("pushing the image to the private registry has failed")

4
integration-cli/docker_cli_save_load_test.go
View file

@ -42,8 +42,8 @@ func TestSaveAndLoadRepo(t *testing.T) {
out, _, err = runCommandWithOutput(inspectCmd) out, _, err = runCommandWithOutput(inspectCmd)
errorOut(err, t, fmt.Sprintf("the repo should exist after loading it: %v %v", out, err)) errorOut(err, t, fmt.Sprintf("the repo should exist after loading it: %v %v", out, err))
go deleteImages(repoName) deleteContainer(cleanedContainerID)
go deleteContainer(cleanedContainerID) deleteImages(repoName)
os.Remove("/tmp/foobar-save-load-test.tar") os.Remove("/tmp/foobar-save-load-test.tar")

2
integration-cli/docker_cli_tag_test.go
View file

@ -79,7 +79,7 @@ func TestTagValidPrefixedRepo(t *testing.T) {
t.Errorf("tag busybox %v should have worked: %s", repo, err) t.Errorf("tag busybox %v should have worked: %s", repo, err)
continue continue
} }
go deleteImages(repo) deleteImages(repo)
logMessage := fmt.Sprintf("tag - busybox %v", repo) logMessage := fmt.Sprintf("tag - busybox %v", repo)
logDone(logMessage) logDone(logMessage)
} }

2
integration-cli/docker_cli_top_test.go
View file

@ -22,7 +22,7 @@ func TestTop(t *testing.T) {
_, err = runCommand(killCmd) _, err = runCommand(killCmd)
errorOut(err, t, fmt.Sprintf("failed to kill container: %v", err)) errorOut(err, t, fmt.Sprintf("failed to kill container: %v", err))
go deleteContainer(cleanedContainerID) deleteContainer(cleanedContainerID)
if !strings.Contains(out, "sleep 20") { if !strings.Contains(out, "sleep 20") {
t.Fatal("top should've listed sleep 20 in the process list") t.Fatal("top should've listed sleep 20 in the process list")