Merge pull request systemd#30620 from mrc0mmand/more-test-tweaks

test: a couple of fixes for failing tests
mrc0mmand · Dec 24, 2023 · 902279f · 902279f
2 parents 891e81e + b4a21d5
commit 902279f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
@@ -1320,24 +1320,24 @@ static int monitor(int argc, char **argv, int (*dump)(sd_bus_message *m, FILE *f
                 if (r < 0)
                         return log_error_errno(r, "Failed to process bus: %m");
 
-                if (!is_monitor) {
-                        const char *name;
+                if (m) {
+                        if (!is_monitor) {
+                                const char *name;
 
-                        /* wait until we lose our unique name */
-                        if (sd_bus_message_is_signal(m, "org.freedesktop.DBus", "NameLost") <= 0)
-                                continue;
+                                /* wait until we lose our unique name */
+                                if (sd_bus_message_is_signal(m, "org.freedesktop.DBus", "NameLost") <= 0)
+                                        continue;
 
-                        r = sd_bus_message_read(m, "s", &name);
-                        if (r < 0)
-                                return bus_log_parse_error(r);
+                                r = sd_bus_message_read(m, "s", &name);
+                                if (r < 0)
+                                        return bus_log_parse_error(r);
 
-                        if (streq(name, unique_name))
-                                is_monitor = true;
+                                if (streq(name, unique_name))
+                                        is_monitor = true;
 
-                        continue;
-                }
+                                continue;
+                        }
 
-                if (m) {
                         dump(m, stdout);
                         fflush(stdout);
 

diff --git a/test/units/testsuite-07.issue-30412.sh b/test/units/testsuite-07.issue-30412.sh
@@ -20,6 +20,7 @@ EOF
 cat >/run/systemd/system/badbin_assert.socket <<EOF
 [Socket]
 ListenStream=@badbin_assert.socket
+FlushPending=yes
 EOF
 
 systemctl daemon-reload