docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deleteAllContainers call in test 

Signed-off-by: Antonio Murdaca <me@runcom.ninja>
This commit is contained in:
Antonio Murdaca 2015-04-23 16:32:48 +02:00
parent 1b4de6f2e8
commit ee7a7b07e7
5 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
integration-cli/docker_api_containers_test.go
View File

@ -773,7 +773,6 @@ func (s *DockerSuite) TestContainerApiPostCreateNull(c *check.C) {
} }
func (s *DockerSuite) TestCreateWithTooLowMemoryLimit(c *check.C) { func (s *DockerSuite) TestCreateWithTooLowMemoryLimit(c *check.C) {
defer deleteAllContainers()
config := `{ config := `{
"Image": "busybox", "Image": "busybox",
"Cmd": "ls", "Cmd": "ls",
@ -795,8 +794,6 @@ func (s *DockerSuite) TestCreateWithTooLowMemoryLimit(c *check.C) {
} }
func (s *DockerSuite) TestStartWithTooLowMemoryLimit(c *check.C) { func (s *DockerSuite) TestStartWithTooLowMemoryLimit(c *check.C) {
defer deleteAllContainers()
out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "create", "busybox")) out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "create", "busybox"))
if err != nil { if err != nil {
c.Fatal(err, out) c.Fatal(err, out)

1
integration-cli/docker_cli_build_test.go
View File

@ -2090,7 +2090,6 @@ func (s *DockerSuite) TestBuildRm(c *check.C) {
if containerCountBefore == containerCountAfter { if containerCountBefore == containerCountAfter {
c.Fatalf("--rm=false should have left containers behind") c.Fatalf("--rm=false should have left containers behind")
} }
deleteAllContainers()
deleteImages(name) deleteImages(name)
} }

7
integration-cli/docker_cli_create_test.go
View File

@ -14,7 +14,6 @@ import (
// Make sure we can create a simple container with some args // Make sure we can create a simple container with some args
func (s *DockerSuite) TestCreateArgs(c *check.C) { func (s *DockerSuite) TestCreateArgs(c *check.C) {
runCmd := exec.Command(dockerBinary, "create", "busybox", "command", "arg1", "arg2", "arg with space") runCmd := exec.Command(dockerBinary, "create", "busybox", "command", "arg1", "arg2", "arg with space")
out, _, _, err := runCommandWithStdoutStderr(runCmd) out, _, _, err := runCommandWithStdoutStderr(runCmd)
if err != nil { if err != nil {
@ -256,9 +255,6 @@ func (s *DockerSuite) TestCreateLabels(c *check.C) {
if !reflect.DeepEqual(expected, actual) { if !reflect.DeepEqual(expected, actual) {
c.Fatalf("Expected %s got %s", expected, actual) c.Fatalf("Expected %s got %s", expected, actual)
} }
deleteAllContainers()
} }
func (s *DockerSuite) TestCreateLabelFromImage(c *check.C) { func (s *DockerSuite) TestCreateLabelFromImage(c *check.C) {
@ -287,9 +283,6 @@ func (s *DockerSuite) TestCreateLabelFromImage(c *check.C) {
if !reflect.DeepEqual(expected, actual) { if !reflect.DeepEqual(expected, actual) {
c.Fatalf("Expected %s got %s", expected, actual) c.Fatalf("Expected %s got %s", expected, actual)
} }
deleteAllContainers()
} }
func (s *DockerSuite) TestCreateHostnameWithNumber(c *check.C) { func (s *DockerSuite) TestCreateHostnameWithNumber(c *check.C) {

3
integration-cli/docker_cli_ps_test.go
View File

@ -478,9 +478,6 @@ func (s *DockerSuite) TestPsListContainersFilterLabel(c *check.C) {
if (!strings.Contains(containerOut, firstID) || !strings.Contains(containerOut, secondID)) || strings.Contains(containerOut, thirdID) { if (!strings.Contains(containerOut, firstID) || !strings.Contains(containerOut, secondID)) || strings.Contains(containerOut, thirdID) {
c.Fatalf("Expected ids %s,%s, got %s for exited filter, output: %q", firstID, secondID, containerOut, out) c.Fatalf("Expected ids %s,%s, got %s for exited filter, output: %q", firstID, secondID, containerOut, out)
} }
deleteAllContainers()
} }
func (s *DockerSuite) TestPsListContainersFilterExited(c *check.C) { func (s *DockerSuite) TestPsListContainersFilterExited(c *check.C) {

2
integration-cli/docker_cli_run_test.go
View File

@ -1448,7 +1448,6 @@ func (s *DockerSuite) TestRunResolvconfUpdater(c *check.C) {
//cleanup //cleanup
defer func() { defer func() {
deleteAllContainers()
if err := ioutil.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil { if err := ioutil.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
c.Fatal(err) c.Fatal(err)
} }
@ -2380,7 +2379,6 @@ func (s *DockerSuite) TestRunVolumesNotRecreatedOnStart(c *check.C) {
testRequires(c, SameHostDaemon) testRequires(c, SameHostDaemon)
// Clear out any remnants from other tests // Clear out any remnants from other tests
deleteAllContainers()
info, err := ioutil.ReadDir(volumesConfigPath) info, err := ioutil.ReadDir(volumesConfigPath)
if err != nil { if err != nil {
c.Fatal(err) c.Fatal(err)