Merge lp:~brendan-donegan/ubuntu-system-settings/bug1319711 into lp:ubuntu-system-settings

[Brendan Donegan]

Make test_tz_list_initially_empty more robust by using wait_select_single instead of select_single to get the label.

Make test_tz_list_initially_empty more robust by using wait_select_single instead of select_single to get the label.

[Iain Lane (laney)]

It's worth a go, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:724
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/859/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/682
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/624
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1294
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1294/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/763
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/763/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_datetime.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	2014-04-04 15:31:49 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	2014-06-05 09:24:41 +0000
@@ -62,7 +62,7 @@
     def test_tz_list_initially_empty(self):
         """ Checks that no list is displayed initially """
         self.system_settings.main_view.scroll_to_and_click(self.tz_page)
-        labelVisible = self.system_settings.main_view.select_single(
+        labelVisible = self.system_settings.main_view.wait_select_single(
             objectName='nothingLabel').visible
         self.assertThat(labelVisible, Equals(True))