Browse code

Merge pull request #39095 from StefanScherer/fix-TestPullWindowsImageFailsOnLinux

Use existing Windows image for test instead of microsoft/nanoserver

Brian Goff authored on 2019/04/18 02:46:14
Showing 1 changed files
... ...
@@ -266,12 +266,12 @@ func (s *DockerHubPullSuite) TestPullClientDisconnect(c *check.C) {
266 266
 func (s *DockerSuite) TestPullLinuxImageFailsOnWindows(c *check.C) {
267 267
 	testRequires(c, DaemonIsWindows, Network)
268 268
 	_, _, err := dockerCmdWithError("pull", "ubuntu")
269
-	assert.ErrorContains(c, err, "no matching manifest")
269
+	assert.ErrorContains(c, err, "no matching manifest for windows")
270 270
 }
271 271
 
272 272
 // Regression test for https://github.com/docker/docker/issues/28892
273 273
 func (s *DockerSuite) TestPullWindowsImageFailsOnLinux(c *check.C) {
274 274
 	testRequires(c, DaemonIsLinux, Network)
275
-	_, _, err := dockerCmdWithError("pull", "microsoft/nanoserver")
276
-	assert.ErrorContains(c, err, "cannot be used on this platform")
275
+	_, _, err := dockerCmdWithError("pull", "mcr.microsoft.com/windows/servercore:ltsc2019")
276
+	assert.ErrorContains(c, err, "no matching manifest for linux")
277 277
 }