From 86ccbc24d1bf9d4771bf754b7f5a5c05ee6d6e8d Mon Sep 17 00:00:00 2001 From: John Howard Date: Fri, 22 Jul 2016 09:05:38 -0700 Subject: [PATCH] Windows: TestRunCleanupCmdOnEntrypoint for nanoserver Signed-off-by: John Howard Upstream-commit: 0d4b8cbdac531058e76526adebb1b8258826d0cf Component: engine --- components/engine/integration-cli/docker_cli_run_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/engine/integration-cli/docker_cli_run_test.go b/components/engine/integration-cli/docker_cli_run_test.go index c1bd3f8f0c..8d53e5a25a 100644 --- a/components/engine/integration-cli/docker_cli_run_test.go +++ b/components/engine/integration-cli/docker_cli_run_test.go @@ -1770,7 +1770,11 @@ func (s *DockerSuite) TestRunCleanupCmdOnEntrypoint(c *check.C) { out = strings.TrimSpace(out) expected := "root" if daemonPlatform == "windows" { - expected = `user manager\containeradministrator` + if WindowsBaseImage == "windowsservercore" { + expected = `user manager\containeradministrator` + } else { + expected = `ContainerAdministrator` // nanoserver + } } if out != expected { c.Fatalf("Expected output %s, got %q", expected, out)