From 8e1aa7af3a3d4fac1aefa94ed4a4455ac190ead9 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 18 Jul 2022 14:38:44 -0600 Subject: Fixes for vendoring Buildah This commit was automatically cherry-picked by buildah-vendor-treadmill v0.3 from the buildah vendor treadmill PR, #13808 Changes since 2022-08-16: - buildah 4139: minor line-number changes to the diff file because helpers.bash got edited - buildah 4190: skip the new test if remote - buildah 4195: add --retry / --retry-delay - changes to deal with vendoring gomega, units - changes to the podman login error message in system test Signed-off-by: Paul Holzinger --- test/system/150-login.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/system') diff --git a/test/system/150-login.bats b/test/system/150-login.bats index b57bb44ab..b85007f0b 100644 --- a/test/system/150-login.bats +++ b/test/system/150-login.bats @@ -122,7 +122,7 @@ function setup() { --password-stdin \ $registry <<< "x${PODMAN_LOGIN_PASS}" is "$output" \ - "Error: error logging into \"$registry\": invalid username/password" \ + "Error: logging into \"$registry\": invalid username/password" \ 'output from podman login' } -- cgit v1.2.3-54-g00ecf