aboutsummaryrefslogtreecommitdiff
path: root/tests/test-dbus-fixture.h
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-16 21:23:57 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-16 21:23:57 -0600
commit2e9d3bb48946ccebf49cff64ab5de67e5714e1e3 (patch)
treeaa8fc3b514a49b58dc797a2083af5f6417adf0f5 /tests/test-dbus-fixture.h
parent6f2e235e660094f6ec27a0a099428ac3fe852ff7 (diff)
downloadayatana-indicator-datetime-2e9d3bb48946ccebf49cff64ab5de67e5714e1e3.tar.gz
ayatana-indicator-datetime-2e9d3bb48946ccebf49cff64ab5de67e5714e1e3.tar.bz2
ayatana-indicator-datetime-2e9d3bb48946ccebf49cff64ab5de67e5714e1e3.zip
get timezone, clock tests running again with Settings & State
Diffstat (limited to 'tests/test-dbus-fixture.h')
-rw-r--r--tests/test-dbus-fixture.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/test-dbus-fixture.h b/tests/test-dbus-fixture.h
index fc7ab5a..db06be2 100644
--- a/tests/test-dbus-fixture.h
+++ b/tests/test-dbus-fixture.h
@@ -86,15 +86,17 @@ class TestDBusFixture: public GlibFixture
virtual void TearDown ()
{
+ wait_msec();
+
// close the system bus
- g_dbus_connection_close (system_bus, nullptr, on_bus_closed, this);
- g_main_loop_run (loop);
- g_clear_object (&system_bus);
+ g_dbus_connection_close(system_bus, nullptr, on_bus_closed, this);
+ g_main_loop_run(loop);
+ g_clear_object(&system_bus);
// tear down the test dbus
- g_test_dbus_down (test_dbus);
- g_clear_object (&test_dbus);
+ g_test_dbus_down(test_dbus);
+ g_clear_object(&test_dbus);
- super::TearDown ();
+ super::TearDown();
}
};