fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-03 10:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'syslog-test-newlines' into 'master'

Browse source 
syslog test: Don't assert that we see plain LF newlines

Closes #243

See merge request dbus/dbus!62
This commit is contained in:
Ralf Habacker 2018-12-05 14:28:36 +00:00
commit 7f5eee6dca
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/internals/syslog.c
View file

@ -78,15 +78,19 @@ test_syslog_normal (Fixture *f,
g_test_trap_subprocess (NULL, 0, 0);
g_test_trap_assert_passed ();
g_test_trap_assert_stderr ("*" MESSAGE "42\n"
"*" MESSAGE "45\n"
"*" MESSAGE "666\n"
"*" MESSAGE "23\n"
/* Deliberately not matching newlines: in Windows they might come out as
* either \n or \r\n, perhaps depending on GLib version or on whether
* we're using Wine or real Windows. */
g_test_trap_assert_stderr ("*" MESSAGE "42"
"*" MESSAGE "45"
"*" MESSAGE "666"
"*" MESSAGE "23"
"*test-syslog-stderr*" MESSAGE
"this should not appear in the syslog\n"
"this should not appear in the syslog"
"*test-syslog-both*" MESSAGE
"this should appear in the syslog and "
"on stderr\n");
"on stderr"
"*");
g_test_trap_assert_stderr_unmatched ("*this should appear in the syslog "
"only*");
g_test_trap_assert_stderr_unmatched ("*test-syslog-only*");