shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

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

Browse Source 
test: a couple of fixes for failing tests
This commit is contained in:
Yu Watanabe 2023-12-25 00:19:14 +09:00 committed by GitHub
commit 902279f0e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/busctl/busctl.c
View File

@ -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;
/* 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);
if (streq(name, unique_name))
is_monitor = true;
continue;
}
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;
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;
continue;
}
dump(m, stdout);
fflush(stdout);

1
test/units/testsuite-07.issue-30412.sh
View File

@ -20,6 +20,7 @@ EOF
cat >/run/systemd/system/badbin_assert.socket <<EOF
[Socket]
ListenStream=@badbin_assert.socket
FlushPending=yes
EOF
systemctl daemon-reload