1. docker
  2. Commit c2fe26243906ad2641876e877d23a419bb4bdb75
Browse code

Add fixes for integration-cli tests w/ --net none

Adds network to integration tests that were failing without network.

Fixes #10964
Fixes #10968

Signed-off-by: Jake Champlin <jake.champlin.27@gmail.com>

Jake Champlin authored on 2015/03/26 12:44:09
Showing 3 changed files
integration-cli/docker_cli_events_test.go
History View file @ c2fe262
... ... 
@@ -149,6 +149,7 @@ func TestEventsImageUntagDelete(t *testing.T) {
149 149
150 150 
 func TestEventsImagePull(t *testing.T) {
151 151 
 	since := daemonTime(t).Unix()
152 
+	testRequires(t, Network)
152 153
153 154 
 	defer deleteImages("hello-world")
154 155
integration-cli/docker_cli_run_test.go
History View file @ c2fe262
... ... 
@@ -147,6 +147,7 @@ func TestRunLeakyFileDescriptors(t *testing.T) {
147 147 
 // it should be possible to lookup Google DNS
148 148 
 // this will fail when Internet access is unavailable
149 149 
 func TestRunLookupGoogleDns(t *testing.T) {
150 
+	testRequires(t, Network)
150 151 
 	defer deleteAllContainers()
151 152
152 153 
 	out, _, _, err := runCommandWithStdoutStderr(exec.Command(dockerBinary, "run", "busybox", "nslookup", "google.com"))
integration-cli/docker_cli_search_test.go
History View file @ c2fe262
... ... 
@@ -8,6 +8,7 @@ import (
8 8
9 9 
 // search for repos named  "registry" on the central registry
10 10 
 func TestSearchOnCentralRegistry(t *testing.T) {
11 
+	testRequires(t, Network)
11 12 
 	searchCmd := exec.Command(dockerBinary, "search", "busybox")
12 13 
 	out, exitCode, err := runCommandWithOutput(searchCmd)
13 14 
 	if err != nil || exitCode != 0 {