From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 16 Aug 2025 19:36:26 +0000 (+0900)
Subject: TEST-17-UDEV: rotate journal after pending journal entries in buffer before flushed
X-Git-Tag: v258-rc3~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04ade57a4233750f45fbc5fa2b5f52adfb435de5;p=thirdparty%2Fsystemd.git

TEST-17-UDEV: rotate journal after pending journal entries in buffer before flushed

Then, expected journal entries should be in the archived journal, hence
hopefully we can safely get them.

Follow-up for 5e4115e59e25fc2eeb31c8f47c3ce1b59835f215.
---

diff --git a/test/units/TEST-17-UDEV.watch.sh b/test/units/TEST-17-UDEV.watch.sh
index cc7f78bbbea..14a05648950 100755
--- a/test/units/TEST-17-UDEV.watch.sh
+++ b/test/units/TEST-17-UDEV.watch.sh
@@ -24,14 +24,13 @@ function check_validity() {
 
 function check() {
     for _ in {1..2}; do
-        # To make journal not rotated during checking journals below.
-        journalctl --rotate
-
         systemctl reset-failed systemd-udevd.service
         systemctl restart systemd-udevd.service
         udevadm settle --timeout=30
 
         journalctl --sync
+        # Also rotate journal to make expected journal entries in an archived journal file.
+        journalctl --rotate
 
         # Check if the inotify watch fd is received from fd store.
         journalctl -n 1 -q -u systemd-udevd.service --invocation=0 --grep 'Received inotify fd \(\d+\) from service manager.'