From 063f1028a2ae3e76a4508ca0dcdf6ec697e75df4 Mon Sep 17 00:00:00 2001 From: Olli Salli Date: Sat, 1 Jan 2011 22:33:36 +0200 Subject: TestConnRosterGroups: Wait for synthesized "accept auth request" event so it won't ruin things later --- tests/dbus/conn-roster-groups.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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() << 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() << mContact, QLatin1String("Please don't fail")), -- cgit v1.2.3