Skip to content

Commit cad85f2

Browse files
committed
Always print stderrdata from D-bus monitor on test failure
Signed-off-by: mulhern <amulhern@redhat.com>
1 parent e819432 commit cad85f2

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

testlib/infra.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -531,19 +531,20 @@ def run_check(self, stop_time):
531531
f'stdout: {stdoutdata.decode("utf-8")}'
532532
)
533533

534-
msg = stdoutdata.decode("utf-8")
535534
self.assertEqual(
536535
self.trace.returncode,
537536
0,
538537
(
539-
stderrdata.decode("utf-8")
540-
if len(msg) == 0
541-
else (
542-
"Error from monitor_dbus_signals: "
543-
+ os.linesep
544-
+ os.linesep
545-
+ msg
546-
)
538+
"Log from monitor_dbus_signals: "
539+
+ os.linesep
540+
+ os.linesep
541+
+ stderrdata.decode("utf-8")
542+
+ os.linesep
543+
+ os.linesep
544+
+ "Error from monitor_dbus_signals: "
545+
+ os.linesep
546+
+ os.linesep
547+
+ stdoutdata.decode("utf-8")
547548
),
548549
)
549550

0 commit comments

Comments
 (0)