]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: test the /boot endpoint under nspawn as well
authorFrantisek Sumsal <frantisek@sumsal.cz>
Sat, 24 Jun 2023 08:33:14 +0000 (10:33 +0200)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Sat, 24 Jun 2023 08:33:14 +0000 (10:33 +0200)
Since #28144 should be now resolved by fb0e106.

test/units/testsuite-04.journal-gatewayd.sh

index 75f51dd745e148e88680963e04293ea0bdf0b651..5755ef1a0ae1f1b92b2227146f6db373b12617bf 100755 (executable)
@@ -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