Merge lp:~elopio/ubuntu-ui-toolkit/autopilot-1.4 into lp:ubuntu-ui-toolkit

[Leo Arias]

Update the tests to work with autopilot 1.4.

Update the tests to work with autopilot 1.4.

[Chris Gagnon (chris.gagnon)]

it worked for me using autopilot -v
Autopilot Source Version: 1.4.0 Autopilot Package Version:
1.4+14.04.20130917ubuntu.unity.nextbzr353saucy0

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:808
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1086/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/80/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/34/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/72/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/81
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/80
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/80/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2707/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2758/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/456
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/453

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1086/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2013-10-04 19:49:11 +0000
+++ debian/control	2013-10-24 19:27:15 +0000
@@ -116,7 +116,7 @@
          dpkg-dev,
          libqt5test5,
          libqt5widgets5,
-         python-autopilot (>= 1.3),
+         python-autopilot (>= 1.4),
          python-mock,
          ubuntu-ui-toolkit-examples (>= ${source:Version}),
 Description: Test package for Ubuntu UI Toolkit

=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2013-10-24 19:27:15 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2013-10-24 19:27:15 +0000
@@ -57,7 +57,10 @@
 
     def get_header(self):
         """Return the Header emulator of the MainView."""
-        return self.select_single('Header', objectName='MainView_Header')
+        try:
+            return self.select_single('Header', objectName='MainView_Header')
+        except dbus.StateNotFoundError:
+            raise ToolkitEmulatorException('The main view has no header.')
 
     def get_toolbar(self):
         """Return the Toolbar emulator of the MainView."""
@@ -109,10 +112,10 @@
         :raise ToolkitEmulatorException: If the main view has no tabs.
 
         """
-        tabs = self.select_single(Tabs)
-        if tabs is None:
+        try:
+            return self.select_single(Tabs)
+        except dbus.StateNotFoundError:
             raise ToolkitEmulatorException(_NO_TABS_ERROR)
-        return tabs
 
     def switch_to_next_tab(self):
         """Open the next tab.
@@ -214,8 +217,9 @@
         :raise ToolkitEmulatorException: If the main view has no tabs.
 
         """
-        tab_bar = self.select_single(TabBar)
-        if tab_bar is None:
+        try:
+            tab_bar = self.select_single(TabBar)
+        except dbus.StateNotFoundError:
             raise ToolkitEmulatorException(_NO_TABS_ERROR)
         tab_bar.switch_to_next_tab()
 
@@ -234,8 +238,9 @@
             name.
 
         """
-        button = self._get_button(object_name)
-        if button is None:
+        try:
+            button = self._get_button(object_name)
+        except dbus.StateNotFoundError:
             raise ToolkitEmulatorException(
                 'Button with objectName "{0}" not found.'.format(object_name))
         self.pointing_device.click_object(button)