Merge lp:~veebers/unity8/adding-extra-helpers-from-sanity into lp:unity8

[Christopher Lee]

Upstreaming required helpers that originate from the Ubuntu sanity test suite.

Upstreaming required helpers that originate from the Ubuntu sanity test suite.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1524
http://jenkins.qa.ubuntu.com/job/unity8-ci/5556/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2269/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/719
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/721
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/721
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1993/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2267
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2267/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19684

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5556/rebuild

review: Needs Fixing (continuous-integration)

[Brendan Donegan (brendan-donegan)]

I suppose we need to add some tests using these two helpers to unity8

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1524
http://jenkins.qa.ubuntu.com/job/unity8-ci/5557/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2272/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/722
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1996/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2270
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2270/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19688

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5557/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

Yes, using swipe to top in a test would be good.

In the case of wait_for_processing_to_complete, it should replace the other calls to the same statement in dash.py. Then it will be used in tests.

[Albert Astals Cid (aacid)]

Text conflict in tests/autopilot/unity8/shell/emulators/dash.py
1 conflicts encountered.

[Albert Astals Cid (aacid)]

Text conflict in tests/autopilot/unity8/shell/emulators/dash.py
1 conflicts encountered.

[lp:~veebers/unity8/adding-extra-helpers-from-sanity]

1525. By Christopher Lee on 2015-05-22

Merge trunk + resolve conflict

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1525
http://jenkins.qa.ubuntu.com/job/unity8-ci/5763/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/42
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20720

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5763/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Please clean your tags as described in https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

review: Needs Fixing

[Albert Astals Cid (aacid)]

Text conflict in tests/autopilot/unity8/shell/emulators/dash.py
1 conflicts encountered.

review: Needs Fixing

[Albert Astals Cid (aacid)]

No work on it for over two months, i'll set it to Work In Progress to clear the dashboard a bit.

Unmerged revisions

1525. By Christopher Lee on 2015-05-22

Merge trunk + resolve conflict

1524. By Christopher Lee on 2015-04-16

Added wait_for_processing_to_complete to Dash CPO.

1523. By Christopher Lee on 2015-04-16

Add swipe_to_top method to GenericScopeView

=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2015-04-28 15:20:13 +0000
+++ tests/autopilot/unity8/shell/emulators/dash.py	2015-05-22 15:41:49 +0000
@@ -72,6 +72,10 @@
         return self.dash_content_list.wait_select_single(
             'QQuickLoader', objectName=("scopeLoader%i" % scope_index))
 
+    def wait_for_processing_to_complete(self):
+        self.select_single(
+            objectName='processingIndicator').visible.wait_for(False)
+
     @autopilot_logging.log_action(logger.info)
     def open_scope(self, scope_id):
         """Open a dash scope.
@@ -185,14 +189,17 @@
 
 
 class ListViewWithPageHeader(ubuntuuitoolkit.QQuickFlickable):
-    pass
+
+    # Overriden because the margin to start the swipe is bigger than in the
+    # other apps. --elopio - 2014-12-11
+    margin_to_swipe_from_bottom = 50
 
 
 class GenericScopeView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
     """Autopilot emulator for generic scopes."""
 
     @autopilot_logging.log_action(logger.info)
-    def open_preview(self, category, app_name):
+    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.
@@ -203,16 +210,25 @@
         # FIXME some categories need a long press in order to see the preview.
         # Some categories do not show previews, like recent apps.
         # --elopio - 2014-1-14
-        self.click_scope_item(category, app_name)
+        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.currentIndex))
 
     @autopilot_logging.log_action(logger.debug)
-    def click_scope_item(self, category, title):
+    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()
+
+    @autopilot_logging.log_action(logger.debug)
+    def click_scope_item(self, category, title, press_duration=0.10):
         """Click an item from the scope.
 
         :parameter category: The name of the category where the item is.
@@ -220,9 +236,12 @@
 
         """
         category_element = self._get_category_element(category)
-        icon = category_element.wait_select_single('AbstractButton',
-                                                   title=title)
-        self.pointing_device.click_object(icon)
+        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 _get_category_element(self, category):
         try:

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2015-05-05 14:46:49 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2015-05-22 15:41:49 +0000
@@ -338,8 +338,9 @@
         self.wait_for_dash()
 
     def ensure_dash_not_running(self):
-        if process_helpers.is_job_running('unity8-dash'):
-            process_helpers.stop_job('unity8-dash')
+        if model() != 'Desktop':
+            if process_helpers.is_job_running('unity8-dash'):
+                process_helpers.stop_job('unity8-dash')
 
     def launch_dash(self, binary_path, variables):
         launch_dash_app_fixture = fixture_setup.LaunchDashApp(

=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2015-04-17 21:58:16 +0000
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2015-05-22 15:41:49 +0000
@@ -120,6 +120,12 @@
         self.assertIsInstance(preview, dash_emulators.Preview)
         self.assertTrue(preview.isCurrent)
 
+    def test_open_preview_of_non_visible_item(self):
+        """Open an item that requires swiping to make it visible."""
+        preview = self.generic_scope.open_preview('2', 'Title.2.0')
+        self.assertIsInstance(preview, dash_emulators.Preview)
+        self.assertTrue(preview.isCurrent)
+
 
 class DashAppsEmulatorTestCase(tests.DashBaseTestCase):