From c2fe26243906ad2641876e877d23a419bb4bdb75 Mon Sep 17 00:00:00 2001 From: Jake Champlin Date: Wed, 25 Mar 2015 23:44:09 -0400 Subject: [PATCH] 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 --- integration-cli/docker_cli_events_test.go | 1 + integration-cli/docker_cli_run_test.go | 1 + integration-cli/docker_cli_search_test.go | 1 + 3 files changed, 3 insertions(+) diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index a74ce15fb4..e855ce88f7 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -149,6 +149,7 @@ func TestEventsImageUntagDelete(t *testing.T) { func TestEventsImagePull(t *testing.T) { since := daemonTime(t).Unix() + testRequires(t, Network) defer deleteImages("hello-world") diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 26cfcccde4..36a526953b 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -147,6 +147,7 @@ func TestRunLeakyFileDescriptors(t *testing.T) { // it should be possible to lookup Google DNS // this will fail when Internet access is unavailable func TestRunLookupGoogleDns(t *testing.T) { + testRequires(t, Network) defer deleteAllContainers() out, _, _, err := runCommandWithStdoutStderr(exec.Command(dockerBinary, "run", "busybox", "nslookup", "google.com")) diff --git a/integration-cli/docker_cli_search_test.go b/integration-cli/docker_cli_search_test.go index fafb5df750..7d6017e3da 100644 --- a/integration-cli/docker_cli_search_test.go +++ b/integration-cli/docker_cli_search_test.go @@ -8,6 +8,7 @@ import ( // search for repos named "registry" on the central registry func TestSearchOnCentralRegistry(t *testing.T) { + testRequires(t, Network) searchCmd := exec.Command(dockerBinary, "search", "busybox") out, exitCode, err := runCommandWithOutput(searchCmd) if err != nil || exitCode != 0 {