p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Updates for virtual user account

Browse Source 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 800c9e81ea9093d587c18bc5c1fd7c0a73b1293f
Component: engine
This commit is contained in:
John Howard
2016-02-23 09:47:52 -08:00
parent cecf6d8a1a
commit e1a3cdb877
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/engine/integration-cli/docker_cli_run_test.go
View File

@ -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)