Unity 8

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

  1. autopilot_notification_fixes
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 2661
Merged at revision: 2719
Proposed branch: lp:~aacid/unity8/autopilot_notification_fixes
Merge into: lp:unity8
Diff against target: 97 lines (+11/-9)
2 files modified
tests/autopilot/unity8/shell/__init__.py (+2/-0)
tests/autopilot/unity8/shell/tests/test_notifications.py (+9/-9)
To merge this branch: bzr merge lp:~aacid/unity8/autopilot_notification_fixes
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+309200@code.launchpad.net

Commit message

Adapt to dummy notification being gone

and warning fix as bonus

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?
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

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2661
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2429/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3183
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3211
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3067/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

LGTM, makes sense, thanks for the fix!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/autopilot/unity8/shell/__init__.py'
--- tests/autopilot/unity8/shell/__init__.py 2015-10-19 14:16:23 +0000
+++ tests/autopilot/unity8/shell/__init__.py 2016-10-25 07:33:46 +0000
@@ -25,6 +25,8 @@
25import ubuntuuitoolkit25import ubuntuuitoolkit
26from autopilot import logging as autopilot_logging26from autopilot import logging as autopilot_logging
27from autopilot import input27from autopilot import input
28import gi
29gi.require_version('Notify', '0.7')
28from gi.repository import Notify30from gi.repository import Notify
2931
30from unity8 import (32from unity8 import (
3133
=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py 2015-11-23 15:41:34 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py 2016-10-25 07:33:46 +0000
@@ -143,7 +143,7 @@
143 )143 )
144144
145 get_notification = lambda: notify_list.wait_select_single(145 get_notification = lambda: notify_list.wait_select_single(
146 'Notification', objectName='notification1')146 'Notification', objectName='notification0')
147 notification = get_notification()147 notification = get_notification()
148148
149 notification.pointing_device.click_object(149 notification.pointing_device.click_object(
@@ -185,7 +185,7 @@
185 # verify and interact with the triggered snap-decision notification185 # verify and interact with the triggered snap-decision notification
186 notify_list = self._get_notifications_list()186 notify_list = self._get_notifications_list()
187 get_notification = lambda: notify_list.wait_select_single(187 get_notification = lambda: notify_list.wait_select_single(
188 'Notification', objectName='notification1')188 'Notification', objectName='notification0')
189 notification = get_notification()189 notification = get_notification()
190 self._assert_notification(190 self._assert_notification(
191 notification, summary, body, False, False, 1.0)191 notification, summary, body, False, False, 1.0)
@@ -234,7 +234,7 @@
234 # verify and interact with the triggered snap-decision notification234 # verify and interact with the triggered snap-decision notification
235 notify_list = self._get_notifications_list()235 notify_list = self._get_notifications_list()
236 get_notification = lambda: notify_list.wait_select_single(236 get_notification = lambda: notify_list.wait_select_single(
237 'Notification', objectName='notification1')237 'Notification', objectName='notification0')
238 notification = get_notification()238 notification = get_notification()
239 self._assert_notification(239 self._assert_notification(
240 notification, summary, body, True, False, 1.0)240 notification, summary, body, True, False, 1.0)
@@ -282,7 +282,7 @@
282 # verify and interact with the triggered snap-decision notification282 # verify and interact with the triggered snap-decision notification
283 notify_list = self._get_notifications_list()283 notify_list = self._get_notifications_list()
284 get_notification = lambda: notify_list.wait_select_single(284 get_notification = lambda: notify_list.wait_select_single(
285 'Notification', objectName='notification1')285 'Notification', objectName='notification0')
286 notification = get_notification()286 notification = get_notification()
287 self._assert_notification(287 self._assert_notification(
288 notification, summary, body, True, False, 1.0)288 notification, summary, body, True, False, 1.0)
@@ -445,7 +445,7 @@
445 notification.show()445 notification.show()
446446
447 notification = lambda: notify_list.wait_select_single(447 notification = lambda: notify_list.wait_select_single(
448 'Notification', objectName='notification1')448 'Notification', objectName='notification0')
449 self._assert_notification(449 self._assert_notification(
450 notification(),450 notification(),
451 summary,451 summary,
@@ -478,7 +478,7 @@
478 notification.show()478 notification.show()
479479
480 notification = lambda: notify_list.wait_select_single(480 notification = lambda: notify_list.wait_select_single(
481 'Notification', objectName='notification1')481 'Notification', objectName='notification0')
482 self._assert_notification(482 self._assert_notification(
483 notification(),483 notification(),
484 summary,484 summary,
@@ -590,7 +590,7 @@
590 notification.show()590 notification.show()
591591
592 notification = notify_list.wait_select_single(592 notification = notify_list.wait_select_single(
593 'Notification', objectName='notification1')593 'Notification', objectName='notification0')
594594
595 self._assert_notification(595 self._assert_notification(
596 notification,596 notification,
@@ -614,7 +614,7 @@
614 notification.show()614 notification.show()
615615
616 notification = notify_list.wait_select_single(616 notification = notify_list.wait_select_single(
617 'Notification', objectName='notification1')617 'Notification', objectName='notification0')
618618
619 self._assert_notification(notification, summary, '', False, False, 1.0)619 self._assert_notification(notification, summary, '', False, False, 1.0)
620620
@@ -683,7 +683,7 @@
683 notification.show()683 notification.show()
684684
685 get_notification = lambda: notify_list.wait_select_single(685 get_notification = lambda: notify_list.wait_select_single(
686 'Notification', objectName='notification1')686 'Notification', objectName='notification0')
687687
688 self._assert_notification(688 self._assert_notification(
689 get_notification(),689 get_notification(),

Subscribers

People subscribed via source and target branches