aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIain Lane <iain.lane@canonical.com>2015-09-03 11:02:27 +0100
committerIain Lane <iain.lane@canonical.com>2015-09-03 11:02:27 +0100
commit49dbcaf901fb3d5fba29f616d1e57a286e85bae8 (patch)
tree2276d3ba141b332318a3f54b31a178b9e4867e52 /tests
parent29b5c4da1e44534352d29536bb6ad1c721406b8a (diff)
downloadayatana-indicator-datetime-49dbcaf901fb3d5fba29f616d1e57a286e85bae8.tar.gz
ayatana-indicator-datetime-49dbcaf901fb3d5fba29f616d1e57a286e85bae8.tar.bz2
ayatana-indicator-datetime-49dbcaf901fb3d5fba29f616d1e57a286e85bae8.zip
Make test-live-actions quit itself once the tz has been changed, the mock no longer does this
Diffstat (limited to 'tests')
-rw-r--r--tests/test-live-actions.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/test-live-actions.cpp b/tests/test-live-actions.cpp
index 9c74813..9f17001 100644
--- a/tests/test-live-actions.cpp
+++ b/tests/test-live-actions.cpp
@@ -37,6 +37,10 @@ TEST_F(TimedateFixture, SetLocation)
EXPECT_NE(expected, m_state->settings->timezone_name.get());
m_actions->set_location(tzid, name);
+ m_state->settings->timezone_name.changed().connect(
+ [this](const std::string&){
+ g_main_loop_quit(loop);
+ });
g_main_loop_run(loop);
EXPECT_EQ(attempted_tzid, tzid);
wait_msec();