1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #24936 from Microsoft/jjh/TestRunCleanupCmdOnEntrypoint

Windows: TestRunCleanupCmdOnEntrypoint for nanoserver
This commit is contained in:
Alexander Morozov 2016-07-22 10:25:54 -07:00 committed by GitHub
commit d602391f8a

View file

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