Merge lp:~ken-vandine/ubuntu-system-settings/rtm-ap_wait_for_reset_dialog into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

Use wait_select_single to fix test_reset_launcher failures

Use wait_select_single to fix test_reset_launcher failures

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:996
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/63/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/64/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/42
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18176

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

996. By Ken VanDine on 2015-02-18

Use wait_select_single to fix test_reset_launcher failures

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-02-04 17:37:50 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-02-18 21:05:32 +0000
@@ -689,7 +689,7 @@
     def _click_reset_launcher(self):
         button = self.select_single(objectName='resetLauncher')
         self.pointing_device.click_object(button)
-        return self.get_root_instance().select_single(
+        return self.get_root_instance().wait_select_single(
             objectName='resetLauncherDialog')
 
     def _wait_and_return_main_system_settins_page(self):