From f6b916d3878dfd4885799c10194781123ffdce53 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sat, 24 Jun 2023 10:33:14 +0200 Subject: [PATCH] test: test the /boot endpoint under nspawn as well Since #28144 should be now resolved by fb0e106. --- test/units/testsuite-04.journal-gatewayd.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/units/testsuite-04.journal-gatewayd.sh b/test/units/testsuite-04.journal-gatewayd.sh index 75f51dd745e..5755ef1a0ae 100755 --- a/test/units/testsuite-04.journal-gatewayd.sh +++ b/test/units/testsuite-04.journal-gatewayd.sh @@ -37,11 +37,8 @@ curl -Lfs --header "Accept: text/plain" http://localhost:19531/entries | \ grep -qE " $TEST_TAG\[[0-9]+\]: $TEST_MESSAGE" curl -Lfs --header "Accept: application/json" http://localhost:19531/entries | \ jq -se ".[] | select(.MESSAGE == \"$TEST_MESSAGE\")" -# FIXME: drop the condition once https://github.com/systemd/systemd/issues/28059 is resolved -if ! systemd-detect-virt -cq; then - curl -Lfs --header "Accept: application/json" http://localhost:19531/entries?boot | \ - jq -se ".[] | select(.MESSAGE == \"$TEST_MESSAGE\")" -fi +curl -Lfs --header "Accept: application/json" http://localhost:19531/entries?boot | \ + jq -se ".[] | select(.MESSAGE == \"$TEST_MESSAGE\")" curl -Lfs --header "Accept: application/json" http://localhost:19531/entries?SYSLOG_IDENTIFIER="$TEST_TAG" | \ jq -se "length == 1 and select(.[].MESSAGE == \"$TEST_MESSAGE\")" # Show 10 entries starting from $BOOT_CURSOR, skip the first 5 -- 2.47.3