Merge into trunk : new_sdk_notif_test

Status:	Merged
Approved by:	Michał Sawicz on 2016-03-04
Approved revision:	2209
Merged at revision:	2222
Proposed branch:	lp:~aacid/unity8/new_sdk_notif_test_fixes
Merge into:	lp:unity8
Diff against target:	23 lines (+2/-1) 2 files modified tests/qmltests/Notifications/tst_OptionToggle.qml (+1/-1) tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml (+1/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/new_sdk_notif_test_fixes
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2016-03-01	Approve on 2016-03-04
Unity8 CI Bot	continuous-integration		Approve on 2016-03-01
Review via email: mp+287612@code.launchpad.net

Commit Message

Make these tests pass with the new SDK

    Changes:
     click not in the middle since that happens to be a button so not useful for testing fall though clicks
     waiting for rendering before pressing a button

I'm going to go with the guess that since some stuff changed speed at being created we need to adjust these

Description of the Change

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

* Did you perform an exploratory manual test run of your code change and any related functionality?
N/A

* Did you make sure that your branch does not contain spurious tags?
Yes

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

* If you changed the UI, has there been a design review?
N/A

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-01:

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-01:

#

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

review: Approve (continuous-integration)

Michał Sawicz (saviq) on 2016-03-04:

#

review: Approve

1	=== modified file 'tests/qmltests/Notifications/tst_OptionToggle.qml'
2	--- tests/qmltests/Notifications/tst_OptionToggle.qml 2015-11-23 15:41:34 +0000
3	+++ tests/qmltests/Notifications/tst_OptionToggle.qml 2016-03-01 11:08:56 +0000
4	@@ -225,7 +225,7 @@
5	}
6
7	// test input does not fall through
8	- mouseClick(notification)
9	+ mouseClick(notification, units.gu(2), units.gu(2))
10	if(data.type == Notification.Interactive) {
11	actionSpy.wait()
12	compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")
13
14	=== modified file 'tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml'
15	--- tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml 2015-11-23 15:41:34 +0000
16	+++ tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml 2016-03-01 11:08:56 +0000
17	@@ -226,6 +226,7 @@
18
19	// remove top-most and verify one of the remaining ones is still getting expanded
20
21	+ waitForRendering(notifications);
22	// make first snap-decision expand
23	mouseClick(snap_decision[0]);
24

Unity 8

Merge lp:~aacid/unity8/new_sdk_notif_test_fixes into lp:unity8

Commit Message

Description of the Change

Preview Diff

Subscribers