From 2bb8a5be9736c1c19afb1e8b301c83ba1ff211d4 Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Wed, 17 Apr 2019 09:49:48 +0200 Subject: [PATCH] Use current windows servercore image Signed-off-by: Stefan Scherer (cherry picked from commit aad7e9797b2e9a980b28d7d77bc119cb4b7e57dc) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 04d0295c0cdfe3e67ab51ca611e3a7dd8a49b668 Component: engine --- components/engine/integration-cli/docker_cli_pull_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_pull_test.go b/components/engine/integration-cli/docker_cli_pull_test.go index dbf97568dc..8526a10855 100644 --- a/components/engine/integration-cli/docker_cli_pull_test.go +++ b/components/engine/integration-cli/docker_cli_pull_test.go @@ -266,12 +266,12 @@ func (s *DockerHubPullSuite) TestPullClientDisconnect(c *check.C) { func (s *DockerSuite) TestPullLinuxImageFailsOnWindows(c *check.C) { testRequires(c, DaemonIsWindows, Network) _, _, err := dockerCmdWithError("pull", "ubuntu") - assert.ErrorContains(c, err, "no matching manifest") + assert.ErrorContains(c, err, "no matching manifest for windows") } // Regression test for https://github.com/docker/docker/issues/28892 func (s *DockerSuite) TestPullWindowsImageFailsOnLinux(c *check.C) { testRequires(c, DaemonIsLinux, Network) - _, _, err := dockerCmdWithError("pull", "microsoft/nanoserver") - assert.ErrorContains(c, err, "cannot be used on this platform") + _, _, err := dockerCmdWithError("pull", "mcr.microsoft.com/windows/servercore:ltsc2019") + assert.ErrorContains(c, err, "no matching manifest for linux") }