aboutsummaryrefslogtreecommitdiff
path: root/tests/timedated-fixture.h
diff options
context:
space:
mode:
authorIain Lane <iain.lane@canonical.com>2015-09-03 10:54:20 +0100
committerIain Lane <iain.lane@canonical.com>2015-09-03 10:54:20 +0100
commit29b5c4da1e44534352d29536bb6ad1c721406b8a (patch)
treeb03e1ad209e51d57036c2706e2df764ed0ed8778 /tests/timedated-fixture.h
parent1da27f9088a759e78e88a390583d8646f2a82656 (diff)
downloadayatana-indicator-datetime-29b5c4da1e44534352d29536bb6ad1c721406b8a.tar.gz
ayatana-indicator-datetime-29b5c4da1e44534352d29536bb6ad1c721406b8a.tar.bz2
ayatana-indicator-datetime-29b5c4da1e44534352d29536bb6ad1c721406b8a.zip
Avoid nested GMainLoops by reading from the file on startup
Restore some tests for this functionality.
Diffstat (limited to 'tests/timedated-fixture.h')
-rw-r--r--tests/timedated-fixture.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/timedated-fixture.h b/tests/timedated-fixture.h
index 0e89ea1..5ec425d 100644
--- a/tests/timedated-fixture.h
+++ b/tests/timedated-fixture.h
@@ -183,8 +183,6 @@ private:
&local_error);
g_assert_no_error (local_error);
g_variant_unref(child);
-
- g_main_loop_quit(self->loop);
}
protected:
@@ -215,6 +213,7 @@ protected:
node_info = nullptr;
object_register_id = 0;
own_name = 0;
+ proxy = nullptr;
// bring up the test bus
bus = g_test_dbus_new(G_TEST_DBUS_NONE);