Merge lp:~canonical-platform-qa/ubuntu-system-tests/use_uitk_base into lp:ubuntu-system-tests

[Brendan Donegan]

Take into account changes in Autopilot to fix CPO handling

Tests need to take into account changes in Autopilot to fix CPO handling

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:115
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/ubuntu-system-tests/use_uitk_base/+merge/259824/+edit-commit-message

http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/281/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/52/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/52/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/52/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/281/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:115
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/284/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/55/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/55/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/55/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/284/rebuild

review: Needs Fixing (continuous-integration)

[Sergio Cazzolato (sergio-j-cazzolato)]

review: Approve

[lp:~canonical-platform-qa/ubuntu-system-tests/use_uitk_base]

116. By Brendan Donegan on 2015-06-02

Fix flake8 issues

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:116
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/285/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/56
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/57
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/56

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/285/rebuild

review: Approve (continuous-integration)

=== modified file 'ubuntu_system_tests/helpers/camera.py'
--- ubuntu_system_tests/helpers/camera.py	2015-05-21 18:15:40 +0000
+++ ubuntu_system_tests/helpers/camera.py	2015-06-02 16:02:42 +0000
@@ -97,7 +97,7 @@
             self.get_option_value_button(value))
 
 
-class Panel(uitk.UbuntuUIToolkitCustomProxyObjectBase, Panel):
+class Panel(Panel):
     """Class to over-ride default Panel helper."""
 
     @autopilot.logging.log_action(logger.info)

=== modified file 'ubuntu_system_tests/tests/base.py'
--- ubuntu_system_tests/tests/base.py	2015-05-21 18:15:40 +0000
+++ ubuntu_system_tests/tests/base.py	2015-06-02 16:02:42 +0000
@@ -32,7 +32,6 @@
 from unity8.shell.emulators import dash
 
 from ubuntu_system_tests.helpers import unity8
-from ubuntu_system_tests.helpers.unity8 import shell
 
 
 logger = logging.getLogger(__name__)
@@ -63,7 +62,7 @@
         pid = process_helpers.get_job_pid('unity8')
         unity = introspection.get_proxy_object_for_existing_process(
             pid=pid,
-            emulator_base=shell.Unity8
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase
         )
         unity.wait_for_greeter_content()
         return unity

=== modified file 'ubuntu_system_tests/tests/test_add_contact.py'
--- ubuntu_system_tests/tests/test_add_contact.py	2015-05-21 18:15:40 +0000
+++ ubuntu_system_tests/tests/test_add_contact.py	2015-06-02 16:02:42 +0000
@@ -21,6 +21,7 @@
 import subprocess
 
 import address_book_app
+import ubuntuuitoolkit
 
 from ubuntu_system_tests.tests import base
 from ubuntu_system_tests.helpers import autopilot as autopilot_helpers
@@ -54,7 +55,7 @@
         apps_scope.click_scope_item('predefined', 'Contacts')
         return autopilot_helpers.get_proxy_object_for_existing_process(
             'address-book-app',
-            address_book_app.AddressBookApp)
+            ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
     def test_add_contact_with_name_and_number(self):
         test_contact = self.get_test_contact()

=== modified file 'ubuntu_system_tests/tests/test_sim_pin.py'
--- ubuntu_system_tests/tests/test_sim_pin.py	2015-05-21 18:15:40 +0000
+++ ubuntu_system_tests/tests/test_sim_pin.py	2015-06-02 16:02:42 +0000
@@ -19,7 +19,7 @@
 #
 
 import autopilot
-import ubuntu_system_settings
+import ubuntuuitoolkit
 from autopilot import exceptions
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
@@ -62,7 +62,8 @@
         self.addCleanup(ensure_system_settings_closed)
 
         self.app = autopilot_helpers.get_proxy_object_for_existing_process(
-            'system-settings', ubuntu_system_settings.SystemSettings)
+            'system-settings',
+            ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
         # As per this bug where we're unable to launch the browser from the
         # scope after a unity8 reboot.
         # https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1401361

=== modified file 'ubuntu_system_tests/tests/test_with_webbrowser.py'
--- ubuntu_system_tests/tests/test_with_webbrowser.py	2015-05-21 18:15:40 +0000
+++ ubuntu_system_tests/tests/test_with_webbrowser.py	2015-06-02 16:02:42 +0000
@@ -42,7 +42,8 @@
 import shutil
 import subprocess
 
-from autopilot import exceptions, platform
+import ubuntuuitoolkit
+from autopilot import exceptions
 from collections import namedtuple
 
 from ubuntu_system_tests.helpers import autopilot as autopilot_helpers
@@ -53,14 +54,6 @@
 
 # Testing vivid on the device but the host doesn't need to be vivid (or have
 # the up-to-date helpers.)
-try:
-    from webbrowser_app.emulators.browser import Webbrowser
-except ImportError:
-    if platform.model() == 'Desktop':
-        logger.info('Ignoring webrowser import error due to running on host.')
-    else:
-        raise
-
 
 PageUrls = namedtuple('PageUrls', ['entered_url', 'title_url', 'actual_url'])
 logger = logging.getLogger(__name__)
@@ -122,7 +115,8 @@
         )
 
         browser = autopilot_helpers.get_proxy_object_for_existing_process(
-            'webbrowser-app', Webbrowser)
+            'webbrowser-app',
+            ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
         # As per this bug where we're unable to launch the browser from the
         # scope after a unity8 reboot.