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

Merge pull request #24936 from Microsoft/jjh/TestRunCleanupCmdOnEntrypoint

Browse Source 
Windows: TestRunCleanupCmdOnEntrypoint for nanoserver
Upstream-commit: d602391f8a6d7679f074191d36bc8af7c5b34267
Component: engine
This commit is contained in:
Alexander Morozov
2016-07-22 10:25:54 -07:00
committed by GitHub
parent b33f7ea15a 86ccbc24d1
commit 90fa09998c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/integration-cli/docker_cli_run_test.go
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)