summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-07-28 16:17:45 +0200
committerGitHub <noreply@github.com>2021-07-28 16:17:45 +0200
commitf9395ddc5ad8b32e4e9b24542f0869722f7c9743 (patch)
tree49b13967ee2b4d00f4f9fe0886fb50888d89270a /test
parent1bf7a9ed9cf8cd18793c11084138ee2b1b2a5365 (diff)
parent4df6e31ccbad8dd7800e413a0377fa0d1a0774ce (diff)
downloadpodman-f9395ddc5ad8b32e4e9b24542f0869722f7c9743.tar.gz
podman-f9395ddc5ad8b32e4e9b24542f0869722f7c9743.tar.bz2
podman-f9395ddc5ad8b32e4e9b24542f0869722f7c9743.zip
Merge pull request #11067 from vrothberg/fix-10154-2
remote build: fix streaming and error handling
Diffstat (limited to 'test')
-rw-r--r--test/system/070-build.bats13
1 files changed, 3 insertions, 10 deletions
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 7b76c585f..26113e45c 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -749,16 +749,9 @@ RUN echo $random_string
EOF
run_podman 125 build -t build_test --pull-never $tmpdir
- # FIXME: this is just ridiculous. Even after #10030 and #10034, Ubuntu
- # remote *STILL* flakes this test! It fails with the correct exit status,
- # but the error output is 'Error: stream dropped, unexpected failure'
- # Let's just stop checking on podman-remote. As long as it exits 125,
- # we're happy.
- if ! is_remote; then
- is "$output" \
- ".*Error: error creating build container: quay.io/libpod/nosuchimage:nosuchtag: image not known" \
- "--pull-never fails with expected error message"
- fi
+ is "$output" \
+ ".*Error: error creating build container: quay.io/libpod/nosuchimage:nosuchtag: image not known" \
+ "--pull-never fails with expected error message"
}
@test "podman build --logfile test" {