Merge lp:~canonical-platform-qa/ubuntu-system-tests/cleanup-inheritance-with-upstreaming into lp:ubuntu-system-tests

[Christopher Lee]

Removing inhouse helpers and troublesome multi-inheritance Click CPO.

Removing inhouse helpers and troublesome multi-inheritance Click CPO.
(Req. this unity8 upstream branch to land first: https://code.launchpad.net/~veebers/unity8/adding-extra-helpers-from-sanity/+merge/256419).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:112
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/204/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-vivid-amd64-ci/205
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-vivid-armhf-ci/204
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-vivid-i386-ci/204

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

review: Approve (continuous-integration)

[Federico Gimenez (fgimenez)]

LGTM

review: Approve

[Brendan Donegan (brendan-donegan)]

When I run this using the packages from the other branches, I get an error about the MainView not being present, and indeed it seems the dash didn't start. Trying to find out why this is - I doubt it's caused by this branch, but needs to be resolved before landing this.

[Brendan Donegan (brendan-donegan)]

Note that this is confirmed to be a UITK issue, with the API being changed and breaking unity8-dash

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:112
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/18/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/40/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/41/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/45/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/18/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

112. By Christopher Lee on 2015-04-16

Remove kludge multi-inherit ClickScope as all req. are/will be upstream.

111. By Christopher Lee on 2015-04-16

Clean up Dash method that I've added in an upstream MP.

110. By Christopher Lee on 2015-04-16

Remove swipe_to_top as I have put it into a MP for upstream (unity8)

109. By Christopher Lee on 2015-04-16

Remove method that exists in upstrea. Have commented in the upstream MP that they differ slightly.

108. By Christopher Lee on 2015-04-16

Remove method that exists upstream verbatim

=== modified file 'ubuntu_sanity_tests/helpers/unity8/dash.py'
--- ubuntu_sanity_tests/helpers/unity8/dash.py	2015-04-06 21:55:41 +0000
+++ ubuntu_sanity_tests/helpers/unity8/dash.py	2015-04-16 03:37:03 +0000
@@ -19,51 +19,6 @@
 #
 
 import ubuntuuitoolkit
-from unity8.shell.emulators import dash as unity8_dash
-
-
-class Dash(unity8_dash.Dash):
-
-    def wait_for_processing_to_complete(self):
-        self.select_single(
-            objectName='processingIndicator').visible.wait_for(False)
-
-
-class GenericScopeView(unity8_dash.GenericScopeView):
-
-    def click_scope_item(self, category, title, press_duration=0.10):
-        category_element = self._get_category_element(category)
-        icon = category_element.wait_select_single(
-            'AbstractButton', title=title)
-        list_view = self.select_single(
-            ListViewWithPageHeader, objectName='categoryListView')
-        list_view.swipe_child_into_view(icon)
-        self.pointing_device.click_object(icon, press_duration=press_duration)
-
-    def open_preview(self, category, app_name, press_duration=0.10):
-        """Open the preview of an application.
-
-        :parameter category: The name of the category where the application is.
-        :parameter app_name: The name of the application.
-        :return: The opened preview.
-
-        """
-        self.click_scope_item(category, app_name, press_duration)
-        preview_list = self.wait_select_single(
-            'QQuickLoader', objectName='subPageLoader')
-        preview_list.subPageShown.wait_for(True)
-        preview_list.x.wait_for(0)
-        self.get_root_instance().select_single(
-            objectName='processingIndicator').visible.wait_for(False)
-        return preview_list.select_single(
-            'Preview', objectName='preview{}'.format(
-                preview_list.initialIndex))
-
-    def swipe_to_top(self):
-        """Swipe to the top of the scope."""
-        list_view = self.select_single(
-            ListViewWithPageHeader, objectName='categoryListView')
-        list_view.swipe_to_top()
 
 
 class ListViewWithPageHeader(ubuntuuitoolkit.QQuickListView):

=== modified file 'ubuntu_sanity_tests/helpers/unityclickscope.py'
--- ubuntu_sanity_tests/helpers/unityclickscope.py	2015-02-25 15:09:04 +0000
+++ ubuntu_sanity_tests/helpers/unityclickscope.py	2015-04-16 03:37:03 +0000
@@ -20,15 +20,6 @@
 
 import unityclickscope
 
-from ubuntu_sanity_tests.helpers.unity8 import dash
-
-
-class ClickScope(unityclickscope.ClickScope, dash.GenericScopeView):
-
-    # Just make sure that the click scope inherits the methods we haven't yet
-    # merged into unity8.
-    pass
-
 
 class Preview(unityclickscope.Preview):