Bläddra i källkod

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 10 år sedan
förälder
incheckning
c2fe262439

+ 1 - 0
integration-cli/docker_cli_events_test.go

@@ -149,6 +149,7 @@ func TestEventsImageUntagDelete(t *testing.T) {
 
 
 func TestEventsImagePull(t *testing.T) {
 func TestEventsImagePull(t *testing.T) {
 	since := daemonTime(t).Unix()
 	since := daemonTime(t).Unix()
+	testRequires(t, Network)
 
 
 	defer deleteImages("hello-world")
 	defer deleteImages("hello-world")
 
 

+ 1 - 0
integration-cli/docker_cli_run_test.go

@@ -147,6 +147,7 @@ func TestRunLeakyFileDescriptors(t *testing.T) {
 // it should be possible to lookup Google DNS
 // it should be possible to lookup Google DNS
 // this will fail when Internet access is unavailable
 // this will fail when Internet access is unavailable
 func TestRunLookupGoogleDns(t *testing.T) {
 func TestRunLookupGoogleDns(t *testing.T) {
+	testRequires(t, Network)
 	defer deleteAllContainers()
 	defer deleteAllContainers()
 
 
 	out, _, _, err := runCommandWithStdoutStderr(exec.Command(dockerBinary, "run", "busybox", "nslookup", "google.com"))
 	out, _, _, err := runCommandWithStdoutStderr(exec.Command(dockerBinary, "run", "busybox", "nslookup", "google.com"))

+ 1 - 0
integration-cli/docker_cli_search_test.go

@@ -8,6 +8,7 @@ import (
 
 
 // search for repos named  "registry" on the central registry
 // search for repos named  "registry" on the central registry
 func TestSearchOnCentralRegistry(t *testing.T) {
 func TestSearchOnCentralRegistry(t *testing.T) {
+	testRequires(t, Network)
 	searchCmd := exec.Command(dockerBinary, "search", "busybox")
 	searchCmd := exec.Command(dockerBinary, "search", "busybox")
 	out, exitCode, err := runCommandWithOutput(searchCmd)
 	out, exitCode, err := runCommandWithOutput(searchCmd)
 	if err != nil || exitCode != 0 {
 	if err != nil || exitCode != 0 {