Browse code

fix 2 integration tests on lxc

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Jessica Frazelle authored on 2015/03/25 13:00:48
Showing 2 changed files
... ...
@@ -1959,6 +1959,7 @@ func TestBuildCancelationKillsSleep(t *testing.T) {
1959 1959
 
1960 1960
 	name := "testbuildcancelation"
1961 1961
 	defer deleteImages(name)
1962
+	defer deleteAllContainers()
1962 1963
 
1963 1964
 	// (Note: one year, will never finish)
1964 1965
 	ctx, err := fakeContext("FROM busybox\nRUN sleep 31536000", nil)
... ...
@@ -413,6 +413,7 @@ func TestRunLinkToContainerNetMode(t *testing.T) {
413 413
 }
414 414
 
415 415
 func TestRunModeNetContainerHostname(t *testing.T) {
416
+	testRequires(t, ExecSupport)
416 417
 	defer deleteAllContainers()
417 418
 	cmd := exec.Command(dockerBinary, "run", "-i", "-d", "--name", "parent", "busybox", "top")
418 419
 	out, _, err := runCommandWithOutput(cmd)