Unity 8

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

  1. fix_autopilot_greeter_tests
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Superseded
Proposed branch: lp:~aacid/unity8/fix_autopilot_greeter_tests
Merge into: lp:unity8
Diff against target: 107 lines (+12/-10)
3 files modified
tests/autopilot/unity8/greeter/__init__.py (+1/-1)
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/fix_autopilot_greeter_tests
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+309203@code.launchpad.net

This proposal has been superseded by a proposal from 2016-10-25.

Commit message

Fix autopilot test_lock_screen tests

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.

Unmerged revisions

Preview Diff

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

Subscribers

People subscribed via source and target branches