git.iko.soy/unity8
on xenial help sign in
Fixed the failure of notification autopilot-test test_sd_incoming_call.
641878cMirco Müller
tests/autopilot/unity8/shell/tests/test_notifications.py+3−4
compare with xenial
unifiedsplit
@@ -59,7 +59,7 @@ class NotificationsBase(UnityTestCase):
59 return '/usr/share/unity8/graphics/' + icon_name
59 return '/usr/share/unity8/graphics/' + icon_name
60 else:
60 else:
61 return os.path.abspath(
61 return os.path.abspath(
62− os.getcwd() + "/../../graphics/" + icon_name
62+ os.getcwd() + "../../qml/graphics/" + icon_name
63 )
63 )
64
64
65 def _get_notifications_list(self):
65 def _get_notifications_list(self):
@@ -161,8 +161,6 @@ class InteractiveNotificationBase(NotificationsBase):
161 unity_proxy = self.launch_unity()
161 unity_proxy = self.launch_unity()
162 unlock_unity(unity_proxy)
162 unlock_unity(unity_proxy)
163
163
164− notify_list = self._get_notifications_list()
165−
166 summary = "Incoming call"
164 summary = "Incoming call"
167 body = "Frank Zappa\n+44 (0)7736 027340"
165 body = "Frank Zappa\n+44 (0)7736 027340"
168 icon_path = self._get_icon_path('avatars/anna_olsson.png')
166 icon_path = self._get_icon_path('avatars/anna_olsson.png')
@@ -191,8 +189,9 @@ class InteractiveNotificationBase(NotificationsBase):
191 hints
189 hints
192 )
190 )
193
191
192+ notify_list = self._get_notifications_list()
194 get_notification = lambda: notify_list.wait_select_single(
193 get_notification = lambda: notify_list.wait_select_single(
195− 'Notification', objectName='notification1')
194+ 'Notification', objectName='notification0')
196 notification = get_notification()
195 notification = get_notification()
197 self._assert_notification(notification, None, None, True, True, 1.0)
196 self._assert_notification(notification, None, None, True, True, 1.0)
198 initial_height = notification.height
197 initial_height = notification.height