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:
commit
d602391f8a
1 changed files with 5 additions and 1 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue