From 8a6a22e24a69e40130dbc2fd5529a7d5771d9fb3 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 8 Oct 2021 11:48:13 +0200 Subject: [PATCH] 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. (cherry picked from commit 9914dff925d9621f7602acc4848f57086944d5fd) --- tests/test-sideload.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/test-sideload.sh b/tests/test-sideload.sh index 687676308..987ffc40d 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