summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2021-10-08 11:48:13 +0200
committerAlexander Larsson <alexander.larsson@gmail.com>2021-10-08 12:05:22 +0200
commit9914dff925d9621f7602acc4848f57086944d5fd (patch)
tree1a49546a85a763ef16a1bbd0163fa49c9769570a
parent3be48f30984966bfc6c0ec7c8ac86298dc45615c (diff)
downloadflatpak-9914dff925d9621f7602acc4848f57086944d5fd.tar.gz
tests: Fix test-sideload.sh if ostree is built with curl backend
The soup backend and the curl backend give slightly different error messages, so we need to tweak the 404 assert check to match both.
-rw-r--r--tests/test-sideload.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/test-sideload.sh b/tests/test-sideload.sh
index 68767630..987ffc40 100644
--- a/tests/test-sideload.sh
+++ b/tests/test-sideload.sh
@@ -112,11 +112,9 @@ httpd_clear_log
if ${FLATPAK} ${U} install -y test-repo org.test.Hello &> install-error-log; then
assert_not_reached "Disabled online install broken"
fi
-assert_file_has_content install-error-log "Server returned status 404: Not Found"
+assert_file_has_content install-error-log "Server returned .*404.*"
assert_file_has_content httpd-log "GET .*commit .*404"
-assert_file_has_content install-error-log "Server returned status 404: Not Found"
-
ln -s $SIDELOAD_REPO $SIDELOAD_REPO_LINK
${FLATPAK} ${U} install -y test-repo org.test.Hello