diff options
| author | Stefan Scherer <stefan.scherer@docker.com> | 2019-04-17 09:49:48 +0200 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2019-04-18 18:06:44 +0200 |
| commit | 04d0295c0cdfe3e67ab51ca611e3a7dd8a49b668 (patch) | |
| tree | d58ca515a19cc0d431cbefc05a9a95402b206bd7 | |
| parent | e4bc7d2fc05fcff4817f39e52b34b17a8f56cd9a (diff) | |
| download | docker-04d0295c0cdfe3e67ab51ca611e3a7dd8a49b668.tar.gz | |
Use current windows servercore image
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
(cherry picked from commit aad7e9797b2e9a980b28d7d77bc119cb4b7e57dc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| -rw-r--r-- | integration-cli/docker_cli_pull_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/integration-cli/docker_cli_pull_test.go b/integration-cli/docker_cli_pull_test.go index dbf97568dc..8526a10855 100644 --- a/integration-cli/docker_cli_pull_test.go +++ b/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") } |