From 29b5c4da1e44534352d29536bb6ad1c721406b8a Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.lane@canonical.com>
Date: Thu, 3 Sep 2015 10:54:20 +0100
Subject: Avoid nested GMainLoops by reading from the file on startup

Restore some tests for this functionality.
---
 tests/timedated-fixture.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tests/timedated-fixture.h')

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);
-- 
cgit v1.2.3