on xenial help sign in
Adapt to dummy notification being gone

and warning fix as bonus Approved by: Lukáš Tinkl, Unity8 CI Bot

commit47eebe20abbc2713658beee2f09abe397c9d64cf authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 29 Nov 2016, 09:40 (10 years ago) parent381271bc2e8ca9
2 files changed+11−9
tests/autopilot/unity8/shell/__init__.py+2 tests/autopilot/unity8/shell/tests/test_notifications.py+9−9
tests/autopilot/unity8/shell/__init__.py+2
@@ -25,6 +25,8 @@ from functools import wraps
2525import ubuntuuitoolkit
2626from autopilot import logging as autopilot_logging
2727from autopilot import input
28+import gi
29+gi.require_version('Notify', '0.7')
2830from gi.repository import Notify
2931
3032from unity8 import (
tests/autopilot/unity8/shell/tests/test_notifications.py+9−9
@@ -143,7 +143,7 @@ class InteractiveNotificationBase(NotificationsBase):
143143 )
144144
145145 get_notification = lambda: notify_list.wait_select_single(
146− 'Notification', objectName='notification1')
146+ 'Notification', objectName='notification0')
147147 notification = get_notification()
148148
149149 notification.pointing_device.click_object(
@@ -185,7 +185,7 @@ class InteractiveNotificationBase(NotificationsBase):
185185 # verify and interact with the triggered snap-decision notification
186186 notify_list = self._get_notifications_list()
187187 get_notification = lambda: notify_list.wait_select_single(
188− 'Notification', objectName='notification1')
188+ 'Notification', objectName='notification0')
189189 notification = get_notification()
190190 self._assert_notification(
191191 notification, summary, body, False, False, 1.0)
@@ -234,7 +234,7 @@ class InteractiveNotificationBase(NotificationsBase):
234234 # verify and interact with the triggered snap-decision notification
235235 notify_list = self._get_notifications_list()
236236 get_notification = lambda: notify_list.wait_select_single(
237− 'Notification', objectName='notification1')
237+ 'Notification', objectName='notification0')
238238 notification = get_notification()
239239 self._assert_notification(
240240 notification, summary, body, True, False, 1.0)
@@ -282,7 +282,7 @@ class InteractiveNotificationBase(NotificationsBase):
282282 # verify and interact with the triggered snap-decision notification
283283 notify_list = self._get_notifications_list()
284284 get_notification = lambda: notify_list.wait_select_single(
285− 'Notification', objectName='notification1')
285+ 'Notification', objectName='notification0')
286286 notification = get_notification()
287287 self._assert_notification(
288288 notification, summary, body, True, False, 1.0)
@@ -445,7 +445,7 @@ class EphemeralNotificationsTests(NotificationsBase):
445445 notification.show()
446446
447447 notification = lambda: notify_list.wait_select_single(
448− 'Notification', objectName='notification1')
448+ 'Notification', objectName='notification0')
449449 self._assert_notification(
450450 notification(),
451451 summary,
@@ -478,7 +478,7 @@ class EphemeralNotificationsTests(NotificationsBase):
478478 notification.show()
479479
480480 notification = lambda: notify_list.wait_select_single(
481− 'Notification', objectName='notification1')
481+ 'Notification', objectName='notification0')
482482 self._assert_notification(
483483 notification(),
484484 summary,
@@ -590,7 +590,7 @@ class EphemeralNotificationsTests(NotificationsBase):
590590 notification.show()
591591
592592 notification = notify_list.wait_select_single(
593− 'Notification', objectName='notification1')
593+ 'Notification', objectName='notification0')
594594
595595 self._assert_notification(
596596 notification,
@@ -614,7 +614,7 @@ class EphemeralNotificationsTests(NotificationsBase):
614614 notification.show()
615615
616616 notification = notify_list.wait_select_single(
617− 'Notification', objectName='notification1')
617+ 'Notification', objectName='notification0')
618618
619619 self._assert_notification(notification, summary, '', False, False, 1.0)
620620
@@ -683,7 +683,7 @@ class EphemeralNotificationsTests(NotificationsBase):
683683 notification.show()
684684
685685 get_notification = lambda: notify_list.wait_select_single(
686− 'Notification', objectName='notification1')
686+ 'Notification', objectName='notification0')
687687
688688 self._assert_notification(
689689 get_notification(),