From 80a63e8a2126239cb06918da25b5ff22c2ad813b Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 21 Jul 2016 19:46:17 -0700 Subject: [PATCH] Windows: Fix TestRunLookupGoogleDNS for nanoserver Signed-off-by: John Howard --- integration-cli/docker_cli_run_test.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index ef7ee70bdb..c1bd3f8f0c 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -63,12 +63,14 @@ func (s *DockerSuite) TestRunLeakyFileDescriptors(c *check.C) { // this will fail when Internet access is unavailable func (s *DockerSuite) TestRunLookupGoogleDNS(c *check.C) { testRequires(c, Network, NotArm) - image := DefaultImage if daemonPlatform == "windows" { - // nslookup isn't present in Windows busybox. Is built-in. - image = WindowsBaseImage + // nslookup isn't present in Windows busybox. Is built-in. Further, + // nslookup isn't present in nanoserver. Hence just use PowerShell... + dockerCmd(c, "run", WindowsBaseImage, "powershell", "Resolve-DNSName", "google.com") + } else { + dockerCmd(c, "run", DefaultImage, "nslookup", "google.com") } - dockerCmd(c, "run", image, "nslookup", "google.com") + } // the exit code should be 0