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
1=== modified file 'tests/autopilot/unity8/shell/__init__.py'
2--- tests/autopilot/unity8/shell/__init__.py 2015-10-19 14:16:23 +0000
3+++ tests/autopilot/unity8/shell/__init__.py 2016-10-25 07:33:46 +0000
4@@ -25,6 +25,8 @@
5 import ubuntuuitoolkit
6 from autopilot import logging as autopilot_logging
7 from autopilot import input
8+import gi
9+gi.require_version('Notify', '0.7')
10 from gi.repository import Notify
11
12 from unity8 import (
13
14=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
15--- tests/autopilot/unity8/shell/tests/test_notifications.py 2015-11-23 15:41:34 +0000
16+++ tests/autopilot/unity8/shell/tests/test_notifications.py 2016-10-25 07:33:46 +0000
17@@ -143,7 +143,7 @@
18 )
19
20 get_notification = lambda: notify_list.wait_select_single(
21- 'Notification', objectName='notification1')
22+ 'Notification', objectName='notification0')
23 notification = get_notification()
24
25 notification.pointing_device.click_object(
26@@ -185,7 +185,7 @@
27 # verify and interact with the triggered snap-decision notification
28 notify_list = self._get_notifications_list()
29 get_notification = lambda: notify_list.wait_select_single(
30- 'Notification', objectName='notification1')
31+ 'Notification', objectName='notification0')
32 notification = get_notification()
33 self._assert_notification(
34 notification, summary, body, False, False, 1.0)
35@@ -234,7 +234,7 @@
36 # verify and interact with the triggered snap-decision notification
37 notify_list = self._get_notifications_list()
38 get_notification = lambda: notify_list.wait_select_single(
39- 'Notification', objectName='notification1')
40+ 'Notification', objectName='notification0')
41 notification = get_notification()
42 self._assert_notification(
43 notification, summary, body, True, False, 1.0)
44@@ -282,7 +282,7 @@
45 # verify and interact with the triggered snap-decision notification
46 notify_list = self._get_notifications_list()
47 get_notification = lambda: notify_list.wait_select_single(
48- 'Notification', objectName='notification1')
49+ 'Notification', objectName='notification0')
50 notification = get_notification()
51 self._assert_notification(
52 notification, summary, body, True, False, 1.0)
53@@ -445,7 +445,7 @@
54 notification.show()
55
56 notification = lambda: notify_list.wait_select_single(
57- 'Notification', objectName='notification1')
58+ 'Notification', objectName='notification0')
59 self._assert_notification(
60 notification(),
61 summary,
62@@ -478,7 +478,7 @@
63 notification.show()
64
65 notification = lambda: notify_list.wait_select_single(
66- 'Notification', objectName='notification1')
67+ 'Notification', objectName='notification0')
68 self._assert_notification(
69 notification(),
70 summary,
71@@ -590,7 +590,7 @@
72 notification.show()
73
74 notification = notify_list.wait_select_single(
75- 'Notification', objectName='notification1')
76+ 'Notification', objectName='notification0')
77
78 self._assert_notification(
79 notification,
80@@ -614,7 +614,7 @@
81 notification.show()
82
83 notification = notify_list.wait_select_single(
84- 'Notification', objectName='notification1')
85+ 'Notification', objectName='notification0')
86
87 self._assert_notification(notification, summary, '', False, False, 1.0)
88
89@@ -683,7 +683,7 @@
90 notification.show()
91
92 get_notification = lambda: notify_list.wait_select_single(
93- 'Notification', objectName='notification1')
94+ 'Notification', objectName='notification0')
95
96 self._assert_notification(
97 get_notification(),

Subscribers

People subscribed via source and target branches