Merge lp:~jonas-drange/ubuntu-system-settings/fix-notification-test into lp:ubuntu-system-settings

[Jonas G. Drange]

Use wait_select_single instead of select_single to make the test less flaky

Use wait_select_single instead of select_single to make the test less flaky

[Sebastien Bacher (seb128)]

thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2346/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3847
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/530
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3844
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3844/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22805

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2346/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/fix-notification-test]

1508. By Jonas G. Drange on 2015-08-25

drop the sleep, replace with Eventually. Use the proper go_to pattern

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1508
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2347/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/531
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3846
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3846/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22811

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2347/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-08-18 13:20:10 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-08-25 14:09:30 +0000
@@ -112,6 +112,11 @@
                                 'securityPrivacyPage')
 
     @autopilot.logging.log_action(logger.debug)
+    def go_to_notification_page(self):
+        return self._go_to_page('entryComponent-notifications',
+                                'systemNotificationsPage')
+
+    @autopilot.logging.log_action(logger.debug)
     def go_to_datetime_page(self):
         return self._go_to_page('entryComponent-time-date', 'timeDatePage')
 

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_notifications.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_notifications.py	2015-03-31 19:38:11 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_notifications.py	2015-08-25 14:09:30 +0000
@@ -8,9 +8,10 @@
 import json
 import os
 import subprocess
-import time
-
-from testtools.matchers import Equals, NotEquals
+
+from autopilot.matchers import Eventually
+
+from testtools.matchers import Equals
 
 from ubuntu_system_settings.tests import UbuntuSystemSettingsTestCase
 
@@ -31,6 +32,7 @@
     def setUp(self):
         # Check legacy items: one for each file in legacy-helpers
         super(NotificationsTestCases, self).setUp()
+        self.notification_page = self.main_view.go_to_notification_page()
 
     def test_item_counts(self):
         """ Checks whether the Notificatins category is available """
@@ -45,13 +47,9 @@
                 ['click', 'list', '--manifest']).decode('utf8'))
         click_count = len([x for x in packages if has_helper(x)])
 
-        notif = self.main_view.select_single(
-            objectName='entryComponent-notifications')
-        self.assertThat(notif, NotEquals(None))
-        self.main_view.pointing_device.click_object(notif)
-        # Have to wait until the model loads
-        time.sleep(1)
-        notif_page = self.main_view.select_single(
-            objectName='systemNotificationsPage')
-        items = notif_page.select_many(toolkit_emulators.Standard)
-        self.assertThat(len(items), Equals(click_count + legacy_count))
+        self.assertThat(
+            lambda: len(
+                self.notification_page.select_many(toolkit_emulators.Standard)
+            ),
+            Eventually(Equals(click_count + legacy_count))
+        )