opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-14 02:41:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

CI: sys: quadlet %T test: do not rely on journal

Browse Source 
Some people might expect this to work:

    systemctl --wait start foo
    journalctl -u foo  ---> displays output from foo

Well, it does not. Not reliably, anyway:

   https://github.com/systemd/systemd/issues/28650

Shrug, okay, deal with it: write value of %T to a tmpfile
instead of relying on journal. I tested with TMPDIR=<many values>
on an SELinux system and, by golly, it works fine.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2023-08-02 15:10:54 -06:00
parent cd5ce63724
commit b91599742c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/system/252-quadlet.bats
View File

@ -784,6 +784,7 @@ EOF
# #
# Step 1: determine what systemd is using for %T. There does not # Step 1: determine what systemd is using for %T. There does not
# seem to be any systemctly way to find this. # seem to be any systemctly way to find this.
percent_t_file="${PODMAN_TMPDIR}/foo"
local service=get-percent-t.$(random_string 10).service local service=get-percent-t.$(random_string 10).service
local unitfile=${UNIT_DIR}/$service local unitfile=${UNIT_DIR}/$service
cat >$unitfile <<EOF cat >$unitfile <<EOF
@ -791,15 +792,12 @@ EOF
Description=Get the value of percent T Description=Get the value of percent T
[Service] [Service]
ExecStart=/bin/bash -c "echo --==%T==--" ExecStart=/bin/bash -c "echo %T >$percent_t_file"
Type=oneshot
EOF EOF
systemctl daemon-reload systemctl daemon-reload
systemctl --wait start $service systemctl --wait start $service
echo "$_LOG_PROMPT journalctl -u $service" percent_t=$(< $percent_t_file)
run journalctl -u $service
echo "$output"
assert "$output" =~ " --==.*==--" "get-percent-T unit ran to completion"
percent_t=$(expr "$output" : ".* --==\(.*\)==--")
# Clean up. Don't bother to systemctl-reload, service_setup does that below. # Clean up. Don't bother to systemctl-reload, service_setup does that below.
rm -f $unitfile rm -f $unitfile