summaryrefslogtreecommitdiff
path: root/test/system
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-07-26 11:55:33 +0200
committerValentin Rothberg <rothberg@redhat.com>2021-07-28 14:46:15 +0200
commit4df6e31ccbad8dd7800e413a0377fa0d1a0774ce (patch)
tree4b81a37fa61e156d871d98f6874d2afe0ba1ab19 /test/system
parenta5de8314188d7376f645d8ac6c6f7a6f685b6a45 (diff)
downloadpodman-4df6e31ccbad8dd7800e413a0377fa0d1a0774ce.tar.gz
podman-4df6e31ccbad8dd7800e413a0377fa0d1a0774ce.tar.bz2
podman-4df6e31ccbad8dd7800e413a0377fa0d1a0774ce.zip
remote build: fix streaming and error handling
Address a number of issues in the streaming logic in remote build, most importantly an error in using buffered channels on the server side. The pattern below does not guarantee that the channel is entirely read before the context fires. for { select { case <- bufferedChannel: ... case <- ctx.Done(): ... } } Fixes: #10154 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'test/system')
-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" {