Преглед изворни кода

Merge pull request #47106 from vvoland/c8d-windows-pull-error-msg

c8d/integration: Adjust error in TestPullLinuxImageFailsOnWindows
Paweł Gronowski пре 1 година
родитељ
комит
615dfdf672
1 измењених фајлова са 7 додато и 1 уклоњено
  1. 7 1
      integration-cli/docker_cli_pull_test.go

+ 7 - 1
integration-cli/docker_cli_pull_test.go

@@ -207,7 +207,13 @@ func (s *DockerHubPullSuite) TestPullClientDisconnect(c *testing.T) {
 func (s *DockerCLIPullSuite) TestPullLinuxImageFailsOnWindows(c *testing.T) {
 	testRequires(c, DaemonIsWindows, Network)
 	_, _, err := dockerCmdWithError("pull", "ubuntu")
-	assert.ErrorContains(c, err, "no matching manifest for windows")
+
+	errorMessage := "no matching manifest for windows"
+	if testEnv.UsingSnapshotter() {
+		errorMessage = "no match for platform in manifest"
+	}
+
+	assert.ErrorContains(c, err, errorMessage)
 }
 
 // Regression test for https://github.com/docker/docker/issues/28892