Selaa lähdekoodia

c8d/TestPullFailsWithAlteredManifest: Adjust error message

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Paweł Gronowski 1 vuosi sitten
vanhempi
commit
f9f439763a
1 muutettua tiedostoa jossa 6 lisäystä ja 2 poistoa
  1. 6 2
      integration-cli/docker_cli_by_digest_test.go

+ 6 - 2
integration-cli/docker_cli_by_digest_test.go

@@ -561,8 +561,12 @@ func (s *DockerRegistrySuite) TestPullFailsWithAlteredManifest(c *testing.T) {
 	out, exitStatus, _ := dockerCmdWithError("pull", imageReference)
 	out, exitStatus, _ := dockerCmdWithError("pull", imageReference)
 	assert.Assert(c, exitStatus != 0)
 	assert.Assert(c, exitStatus != 0)
 
 
-	expectedErrorMsg := fmt.Sprintf("manifest verification failed for digest %s", manifestDigest)
-	assert.Assert(c, is.Contains(out, expectedErrorMsg))
+	if testEnv.UsingSnapshotter() {
+		assert.Assert(c, is.Contains(out, "unexpected commit digest"))
+		assert.Assert(c, is.Contains(out, "expected "+manifestDigest))
+	} else {
+		assert.Assert(c, is.Contains(out, fmt.Sprintf("manifest verification failed for digest %s", manifestDigest)))
+	}
 }
 }
 
 
 // TestPullFailsWithAlteredManifest tests that a `docker pull` fails when
 // TestPullFailsWithAlteredManifest tests that a `docker pull` fails when