From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sat, 24 Jun 2023 08:33:14 +0000 (+0200)
Subject: test: test the /boot endpoint under nspawn as well
X-Git-Tag: v254-rc1~122^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6b916d3878dfd4885799c10194781123ffdce53;p=thirdparty%2Fsystemd.git

test: test the /boot endpoint under nspawn as well

Since #28144 should be now resolved by fb0e106.
---

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