@@ -13,7 +13,7 @@ load helpers
1313 # force a failed pull and look at the error message which *must* include the
1414 # the resolved image name (localhost/image:latest).
1515 run_buildah 125 pull --policy=always image
16- [[ " $output " == * " Error initializing source docker://localhost/image:latest" * ]]
16+ [[ " $output " == * " initializing source docker://localhost/image:latest" * ]]
1717 run_buildah rmi localhost/image ${iid}
1818}
1919
@@ -186,11 +186,11 @@ load helpers
186186
187187 # Try to pull encrypted image without key should fail
188188 run_buildah 125 pull --signature-policy ${TESTSDIR} /policy.json oci:${TESTDIR} /tmp/busybox_enc
189- expect_output --substring " Error decrypting layer .* missing private key needed for decryption"
189+ expect_output --substring " decrypting layer .* missing private key needed for decryption"
190190
191191 # Try to pull encrypted image with wrong key should fail
192192 run_buildah 125 pull --signature-policy ${TESTSDIR} /policy.json --decryption-key ${TESTDIR} /tmp/mykey2.pem oci:${TESTDIR} /tmp/busybox_enc
193- expect_output --substring " Error decrypting layer .* no suitable key unwrapper found or none of the private keys could be used for decryption"
193+ expect_output --substring " decrypting layer .* no suitable key unwrapper found or none of the private keys could be used for decryption"
194194
195195 # Providing the right key should succeed
196196 run_buildah pull --signature-policy ${TESTSDIR} /policy.json --decryption-key ${TESTDIR} /tmp/mykey.pem oci:${TESTDIR} /tmp/busybox_enc
@@ -208,11 +208,11 @@ load helpers
208208
209209 # Try to pull encrypted image without key should fail
210210 run_buildah 125 pull --signature-policy ${TESTSDIR} /policy.json --tls-verify=false --creds testuser:testpassword docker://localhost:5000/buildah/busybox_encrypted:latest
211- expect_output --substring " Error decrypting layer .* missing private key needed for decryption"
211+ expect_output --substring " decrypting layer .* missing private key needed for decryption"
212212
213213 # Try to pull encrypted image with wrong key should fail, with diff. msg
214214 run_buildah 125 pull --signature-policy ${TESTSDIR} /policy.json --tls-verify=false --creds testuser:testpassword --decryption-key ${TESTDIR} /tmp/mykey2.pem docker://localhost:5000/buildah/busybox_encrypted:latest
215- expect_output --substring " Error decrypting layer .* no suitable key unwrapper found or none of the private keys could be used for decryption"
215+ expect_output --substring " decrypting layer .* no suitable key unwrapper found or none of the private keys could be used for decryption"
216216
217217 # Providing the right key should succeed
218218 run_buildah pull --signature-policy ${TESTSDIR} /policy.json --tls-verify=false --creds testuser:testpassword --decryption-key ${TESTDIR} /tmp/mykey.pem docker://localhost:5000/buildah/busybox_encrypted:latest
@@ -234,11 +234,11 @@ load helpers
234234
235235 # Try to pull encrypted image without key should fail
236236 run_buildah 125 pull --signature-policy ${TESTSDIR} /policy.json --tls-verify=false --creds testuser:testpassword docker://localhost:5000/buildah/busybox_encrypted:latest
237- expect_output --substring " Error decrypting layer .* missing private key needed for decryption"
237+ expect_output --substring " decrypting layer .* missing private key needed for decryption"
238238
239239 # Try to pull encrypted image with wrong key should fail
240240 run_buildah 125 pull --signature-policy ${TESTSDIR} /policy.json --tls-verify=false --creds testuser:testpassword --decryption-key ${TESTDIR} /tmp/mykey2.pem docker://localhost:5000/buildah/busybox_encrypted:latest
241- expect_output --substring " Error decrypting layer .* no suitable key unwrapper found or none of the private keys could be used for decryption"
241+ expect_output --substring " decrypting layer .* no suitable key unwrapper found or none of the private keys could be used for decryption"
242242
243243 # Providing the right key should succeed
244244 run_buildah pull --signature-policy ${TESTSDIR} /policy.json --tls-verify=false --creds testuser:testpassword --decryption-key ${TESTDIR} /tmp/mykey.pem docker://localhost:5000/buildah/busybox_encrypted:latest
0 commit comments