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

fix 2 integration tests on lxc

Browse source 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
This commit is contained in:
Jessica Frazelle 2015-03-24 21:00:48 -07:00
parent ca32446950
commit b596d025f5
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
integration-cli/docker_cli_build_test.go
View file

@ -1958,6 +1958,7 @@ func TestBuildCancelationKillsSleep(t *testing.T) {
name := "testbuildcancelation" name := "testbuildcancelation"
defer deleteImages(name) defer deleteImages(name)
defer deleteAllContainers()
// (Note: one year, will never finish) // (Note: one year, will never finish)
ctx, err := fakeContext("FROM busybox\nRUN sleep 31536000", nil) ctx, err := fakeContext("FROM busybox\nRUN sleep 31536000", nil)

1
integration-cli/docker_cli_run_test.go
View file

@ -413,6 +413,7 @@ func TestRunLinkToContainerNetMode(t *testing.T) {
} }
func TestRunModeNetContainerHostname(t *testing.T) { func TestRunModeNetContainerHostname(t *testing.T) {
testRequires(t, ExecSupport)
defer deleteAllContainers() defer deleteAllContainers()
cmd := exec.Command(dockerBinary, "run", "-i", "-d", "--name", "parent", "busybox", "top") cmd := exec.Command(dockerBinary, "run", "-i", "-d", "--name", "parent", "busybox", "top")
out, _, err := runCommandWithOutput(cmd) out, _, err := runCommandWithOutput(cmd)