Unity 8

Merge lp:~mterry/unity8/test-greeter-dbus-fixes into lp:unity8

test-greeter-dbus-fixes
Merge into trunk

Proposed by Michael Terry on 2016-04-22

Status:	Merged
Approved by:	Albert Astals Cid on 2016-04-25
Approved revision:	2335
Merged at revision:	2366
Proposed branch:	lp:~mterry/unity8/test-greeter-dbus-fixes
Merge into:	lp:unity8
Diff against target:	27 lines (+3/-5) 1 file modified tests/plugins/IntegratedLightDM/dbus.cpp (+3/-5)
To merge this branch:	bzr merge lp:~mterry/unity8/test-greeter-dbus-fixes
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2016-04-22	Approve on 2016-04-25
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-04-22
Review via email: mp+292677@code.launchpad.net

Commit Message

Fix some unreliable test code.

Description of the Change

More reliable checks for success in testGreeterDBus.

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes: while make -C builddir xvfbtestGreeterDBus; do :; done

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
NA

* If you changed the UI, has there been a design review?
NA

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-22:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1041/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-04-25:

* Did you perform an exploratory manual test run of the code change and any related functionality?
No, i didn't it's test code only and looks better

* Did CI run pass? If not, please explain why.
Autopilot has issues, not related to this

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'tests/plugins/IntegratedLightDM/dbus.cpp'
2	--- tests/plugins/IntegratedLightDM/dbus.cpp 2015-08-19 14:24:07 +0000
3	+++ tests/plugins/IntegratedLightDM/dbus.cpp 2016-04-22 18:36:32 +0000
4	@@ -138,7 +138,7 @@
5	greeter->authenticate("has-password");
6	spy.wait();
7
8	- QCOMPARE(spy.count(), 1);
9	+ QVERIFY(spy.count() > 0);
10	QList<QVariant> arguments = spy.takeFirst();
11	QVERIFY(arguments.at(0).toString() == "com.canonical.UnityGreeter.List");
12	QVERIFY(arguments.at(1).toMap().contains("ActiveEntry"));
13	@@ -150,12 +150,10 @@
14	QVERIFY(dbusList->property("EntryIsLocked").toBool());
15
16	greeter->authenticate("no-password");
17	- QCoreApplication::processEvents(); // wait for auth to finish
18	- QVERIFY(!dbusList->property("EntryIsLocked").toBool());
19	+ QTRY_VERIFY(!dbusList->property("EntryIsLocked").toBool());
20
21	greeter->authenticate("has-password");
22	- QCoreApplication::processEvents(); // wait for auth to finish
23	- QVERIFY(dbusList->property("EntryIsLocked").toBool());
24	+ QTRY_VERIFY(dbusList->property("EntryIsLocked").toBool());
25	}
26
27	void testEntryIsLockedChanged()