From 800c9e81ea9093d587c18bc5c1fd7c0a73b1293f Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 23 Feb 2016 09:47:52 -0800 Subject: [PATCH] Windows: Updates for virtual user account Signed-off-by: John Howard --- integration-cli/docker_cli_run_test.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index dd979990b3..e401176d24 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -658,7 +658,12 @@ func (s *DockerSuite) TestRunExitCode(c *check.C) { func (s *DockerSuite) TestRunUserDefaults(c *check.C) { expected := "uid=0(root) gid=0(root)" if daemonPlatform == "windows" { - expected = "uid=1000(SYSTEM) gid=1000(SYSTEM)" + // TODO Windows: Remove this check once TP4 is no longer supported. + if windowsDaemonKV < 14250 { + expected = "uid=1000(SYSTEM) gid=1000(SYSTEM)" + } else { + expected = "uid=1000(ContainerAdministrator) gid=1000(ContainerAdministrator)" + } } out, _ := dockerCmd(c, "run", "busybox", "id") if !strings.Contains(out, expected) { @@ -1710,7 +1715,12 @@ func (s *DockerSuite) TestRunCleanupCmdOnEntrypoint(c *check.C) { out = strings.TrimSpace(out) expected := "root" if daemonPlatform == "windows" { - expected = `nt authority\system` + // TODO Windows: Remove this check once TP4 is no longer supported. + if windowsDaemonKV < 14250 { + expected = `nt authority\system` + } else { + expected = `user manager\containeradministrator` + } } if out != expected { c.Fatalf("Expected output %s, got %q", expected, out)