git.iko.soy/unity8
on xenial help sign in
Fix some unreliable test code.
06a278cMichael Terry
tests/plugins/IntegratedLightDM/dbus.cpp+3−5
compare with xenial
unifiedsplit
@@ -138,7 +138,7 @@ private Q_SLOTS:
138 greeter->authenticate("has-password");
138 greeter->authenticate("has-password");
139 spy.wait();
139 spy.wait();
140
140
141− QCOMPARE(spy.count(), 1);
141+ QVERIFY(spy.count() > 0);
142 QList<QVariant> arguments = spy.takeFirst();
142 QList<QVariant> arguments = spy.takeFirst();
143 QVERIFY(arguments.at(0).toString() == "com.canonical.UnityGreeter.List");
143 QVERIFY(arguments.at(0).toString() == "com.canonical.UnityGreeter.List");
144 QVERIFY(arguments.at(1).toMap().contains("ActiveEntry"));
144 QVERIFY(arguments.at(1).toMap().contains("ActiveEntry"));
@@ -150,12 +150,10 @@ private Q_SLOTS:
150 QVERIFY(dbusList->property("EntryIsLocked").toBool());
150 QVERIFY(dbusList->property("EntryIsLocked").toBool());
151
151
152 greeter->authenticate("no-password");
152 greeter->authenticate("no-password");
153− QCoreApplication::processEvents(); // wait for auth to finish
154− QVERIFY(!dbusList->property("EntryIsLocked").toBool());
153+ QTRY_VERIFY(!dbusList->property("EntryIsLocked").toBool());
155
154
156 greeter->authenticate("has-password");
155 greeter->authenticate("has-password");
157− QCoreApplication::processEvents(); // wait for auth to finish
158− QVERIFY(dbusList->property("EntryIsLocked").toBool());
156+ QTRY_VERIFY(dbusList->property("EntryIsLocked").toBool());
159 }
157 }
160
158
161 void testEntryIsLockedChanged()
159 void testEntryIsLockedChanged()