on xenial help sign in
Include fixes from test-greeter-dbus-fixes
commit0a1da022a61dd2d410047439d50bf38ef8425ff2 authorMichael Terry <michael.terry@canonical.com> dateFri 22 Apr 2016, 16:05 (11 years ago) parent83142c3
1 file changed+3−5
tests/plugins/IntegratedLightDM/dbus.cpp+3−5
tests/plugins/IntegratedLightDM/dbus.cpp+3−5
@@ -139,7 +139,7 @@ private Q_SLOTS:
139139 greeter->authenticate("has-password");
140140 spy.wait();
141141
142− QCOMPARE(spy.count(), 1);
142+ QVERIFY(spy.count() > 0);
143143 QList<QVariant> arguments = spy.takeFirst();
144144 QVERIFY(arguments.at(0).toString() == "com.canonical.UnityGreeter.List");
145145 QVERIFY(arguments.at(1).toMap().contains("ActiveEntry"));
@@ -151,12 +151,10 @@ private Q_SLOTS:
151151 QVERIFY(dbusList->property("EntryIsLocked").toBool());
152152
153153 greeter->authenticate("no-password");
154− QCoreApplication::processEvents(); // wait for auth to finish
155− QVERIFY(!dbusList->property("EntryIsLocked").toBool());
154+ QTRY_VERIFY(!dbusList->property("EntryIsLocked").toBool());
156155
157156 greeter->authenticate("has-password");
158− QCoreApplication::processEvents(); // wait for auth to finish
159− QVERIFY(dbusList->property("EntryIsLocked").toBool());
157+ QTRY_VERIFY(dbusList->property("EntryIsLocked").toBool());
160158 }
161159
162160 void testEntryIsLockedChanged()