summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/dbus/conn-roster-groups.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/dbus/conn-roster-groups.cpp b/tests/dbus/conn-roster-groups.cpp
index 99631361..d4dba219 100644
--- a/tests/dbus/conn-roster-groups.cpp
+++ b/tests/dbus/conn-roster-groups.cpp
@@ -361,6 +361,12 @@ void TestConnRosterGroups::testNotADeathTrap()
QVERIFY(mContact->subscriptionState() != Contact::PresenceStateNo);
+ // Bah... The test CM fails to cancel its "accept auth request" synthesized event even if we
+ // cancel the subscription request, and that event may screw up the rest of the test. So, wait
+ // for the event here.
+ while (mContact->subscriptionState() != Contact::PresenceStateYes)
+ mLoop->processEvents();
+
QVERIFY(connect(mConn->contactManager()->removePresenceSubscription(
QList<ContactPtr>() << mContact,
QLatin1String("Please don't fail")),
@@ -443,6 +449,12 @@ void TestConnRosterGroups::testNotADeathTrap()
QVERIFY(mContact->subscriptionState() != Contact::PresenceStateNo);
+ // Bah... The test CM fails to cancel its "accept auth request" synthesized event even if we
+ // cancel the subscription request, and that event may screw up the rest of the test. So, wait
+ // for the event here.
+ while (mContact->subscriptionState() != Contact::PresenceStateYes)
+ mLoop->processEvents();
+
QVERIFY(connect(mConn->contactManager()->removePresenceSubscription(
QList<ContactPtr>() << mContact,
QLatin1String("Please don't fail")),