aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2016-04-27 10:40:05 +0200
committerCharles Kerr <charles.kerr@canonical.com>2016-04-27 10:40:05 +0200
commitccfe9ef48c6e072f5d0ec9918de90213a2f4a7ee (patch)
tree9dfdf42ef43c7a1d3a670cc88d7573f368fe45d9
parentfcf75a545e25baa8777a310c648846537590fa2b (diff)
downloadayatana-indicator-display-ccfe9ef48c6e072f5d0ec9918de90213a2f4a7ee.tar.gz
ayatana-indicator-display-ccfe9ef48c6e072f5d0ec9918de90213a2f4a7ee.tar.bz2
ayatana-indicator-display-ccfe9ef48c6e072f5d0ec9918de90213a2f4a7ee.zip
sync tests to r33 changes
-rw-r--r--tests/unit/usb-snap-test.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/unit/usb-snap-test.cpp b/tests/unit/usb-snap-test.cpp
index 3b778dd..6cfbbd9 100644
--- a/tests/unit/usb-snap-test.cpp
+++ b/tests/unit/usb-snap-test.cpp
@@ -130,14 +130,9 @@ TEST_F(UsbSnapFixture, TestRoundTrip)
EXPECT_TRUE(user_response_set);
ASSERT_EQ(test.expected_response, user_response);
- // confirm that the snap dtor cleans up the notification
+ // confirm that the snap dtor doesn't try to close
+ // the notification that's already been closed by user choice
snap.reset();
- wait_for_signals(notificationsSpy, 1);
- {
- QVariantList const& call(notificationsSpy.at(0));
- EXPECT_EQ("CloseNotification", call.at(0));
- QVariantList const& args(call.at(1).toList());
- EXPECT_EQ(id, args.at(0));
- }
+ EXPECT_FALSE(notificationsSpy.wait(1000));
}
}