aboutsummaryrefslogtreecommitdiff
path: root/tests/unit
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2016-03-15 16:12:05 -0500
committerCharles Kerr <charles.kerr@canonical.com>2016-03-15 16:12:05 -0500
commitee369babc9185bac7c7910a68a1e58bab7efa64c (patch)
treebf1e33eab582e699515a59e9edd258765e6988b3 /tests/unit
parent670f6fd05bd49e58ea326656fe8f231df4685533 (diff)
downloadayatana-indicator-display-ee369babc9185bac7c7910a68a1e58bab7efa64c.tar.gz
ayatana-indicator-display-ee369babc9185bac7c7910a68a1e58bab7efa64c.tar.bz2
ayatana-indicator-display-ee369babc9185bac7c7910a68a1e58bab7efa64c.zip
oops, last commit's diagnosis was incorrect. The timing test issue came from async dbus handling interfering with fast setup/teardown of automated tests. Revert the last change and fix by setting up the dbus signal subscription immediately upon getting the dbus connection.
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/usb-snap-test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit/usb-snap-test.cpp b/tests/unit/usb-snap-test.cpp
index 4300c47..84555cc 100644
--- a/tests/unit/usb-snap-test.cpp
+++ b/tests/unit/usb-snap-test.cpp
@@ -163,7 +163,7 @@ TEST_F(UsbSnapFixture, TestRoundTrip)
QVariantList() << id << test.action_to_invoke);
// test that UsbSnap emits on_user_response() as a result
- wait_for([&user_response_set](){return user_response_set;}, 2000);
+ wait_for([&user_response_set](){return user_response_set;});
EXPECT_TRUE(user_response_set);
ASSERT_EQ(test.expected_response, user_response);