e59897b · unity8 · git.iko.soy

git.iko.soy/unity8

Fix minor issues.

commite59897b361fdbea7cb9e608043c49a6be45d49a4 authorYing-Chun Liu <paul.liu@canonical.com> dateTue 17 Feb 2015, 23:33 (12 years ago) parentca6ddf2

3 files changed+10−11

compare with xenial

unifiedsplit

tests/autopilot/unity8/shell/__init__.py+1−4 tests/autopilot/unity8/shell/emulators/main_window.py+5−4 tests/autopilot/unity8/shell/tests/test_notifications.py+4−3

tests/autopilot/unity8/shell/__init__.py+1−4

@@ -22,15 +22,12 @@

2222from time import sleep

2323from functools import wraps

2424from gi.repository import Notify

25−import ubuntuuitoolkit

26−from autopilot import introspection

27−from autopilot.introspection import dbus

28−from unity8.shell import emulators

2925

3026import logging

3127

3228logger = logging.getLogger(__name__)

3329

30+

3431def disable_qml_mocking(fn):

3532 """Simple decorator that disables the QML mocks from being loaded."""

3633 @wraps(fn)

tests/autopilot/unity8/shell/emulators/main_window.py+5−4

@@ -175,7 +175,8 @@ class QQuickView(emulators.UnityEmulatorBase):

175175 objectName='pinPadButton{}'.format(button_id)

176176 )

177177

178− def wait_for_notification_dialog(self):

178+ @autopilot_logging.log_action(logger.info)

179+ def wait_for_notification(self):

179180 """Wait for a notification dialog to appear.

180181

181182 :return: An object for the notification dialog data.

@@ -187,6 +188,6 @@ class QQuickView(emulators.UnityEmulatorBase):

187188 objectName='notificationList')

188189 visible_notification = notify_list.wait_select_single('Notification',

189190 visible=True)

190− return { "summary": visible_notification.summary,

191− "body": visible_notification.body,

192− "iconSource": visible_notification.iconSource }

191+ return {'summary': visible_notification.summary,

192+ 'body': visible_notification.body,

193+ 'iconSource': visible_notification.iconSource}

tests/autopilot/unity8/shell/tests/test_notifications.py+4−3

@@ -715,7 +715,8 @@ class EphemeralNotificationsTests(NotificationsBase):

715715 notification = shell.create_ephemeral_notification(summary, body)

716716 notification.show()

717717

718− notification_data = self.main_window.wait_for_notification_dialog()

718+ notification_data = self.main_window.wait_for_notification()

719719

720− self.assertThat(notification_data["summary"], Eventually(Equals(summary)))

721− self.assertThat(notification_data["body"], Eventually(Equals(body)))

720+ self.assertThat(notification_data['summary'],

721+ Eventually(Equals(summary)))

722+ self.assertThat(notification_data['body'], Eventually(Equals(body)))