fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-09 07:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pending-fd-timeout' into 'master'

Browse source 
dbus-daemon test: Allow much longer for pending fd timeout

Reviewed-by: rhabacker
See merge request dbus/dbus!26
This commit is contained in:
Simon McVittie 2018-10-23 19:21:58 +00:00
commit c9d3bf5f3f
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/dbus-daemon.c
View file

@ -1001,9 +1001,13 @@ test_pending_fd_timeout (Fixture *f,
test_progress ('.');
test_main_context_iterate (f->ctx, TRUE);
/* It should take no longer than 500ms to get disconnected. We'll
* be generous and allow 1000ms. */
g_assert_cmpint (g_get_monotonic_time (), <=, start + G_USEC_PER_SEC);
/* It should take 0.5s to get disconnected, as configured in
* valid-config-files/pending-fd-timeout.conf; but this test
* might get starved by other processes running in parallel
* (particularly on shared CI systems), so we have to be a lot
* more generous. Allow up to 10 seconds. */
g_assert_cmpint (g_get_monotonic_time (), <=,
start + (10 * G_USEC_PER_SEC));
}
g_object_unref (socket);