Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1384703-flickable_infinite_loop into lp:ubuntu-ui-toolkit/staging

[Leo Arias]

Fixed the infinite loop when running flickable tests.

[lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1384703-flickable_infinite_loop]

1306. By Leo Arias on 2014-10-23

Reordered the comment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1305
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1159/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/992
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/991
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/991/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/991
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7422
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7422/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15007

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1159/rebuild

review: Needs Fixing (continuous-integration)

[Chris Gagnon (chris.gagnon)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1306
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1164/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/997
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/996
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/996/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/996
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7437
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7437/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15021

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1164/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1306
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1167/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/1000
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/999
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/999/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/999
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5821
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7450
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7450/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15045

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1167/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

Two crashes on this run made it fail. The test added works.

[Cris Dywan (kalikiana)]

Good to see this addressed, as I actually got a branch failing due to this now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-10-01 16:29:23 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-10-23 13:45:32 +0000
@@ -77,15 +77,20 @@
     def _slow_drag(self, start_x, stop_x, start_y, stop_y):
         # If we drag too fast, we end up scrolling more than what we
         # should, sometimes missing the  element we are looking for.
+        original_content_y = self.contentY
+
         # I found that when the flickDeceleration is 1500, the rate should be
         # 5 and that when it's 100, the rate should be 1. With those two points
-        # we can get that the following equation.
+        # we can get the following equation.
         # XXX The deceleration might not be linear with respect to the rate,
         # but this works for the two types of scrollables we have for now.
         # --elopio - 2014-05-08
         rate = (self.flickDeceleration + 250) / 350
         self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate=rate)
 
+        if self.contentY == original_content_y:
+            raise _common.ToolkitException('Could not swipe in the flickable.')
+
 
 class QQuickFlickable(Scrollable):
 
@@ -105,7 +110,6 @@
 
     @autopilot_logging.log_action(logger.info)
     def _swipe_non_visible_child_into_view(self, child, containers):
-        original_content_y = self.contentY
         while not self._is_child_visible(child, containers):
             # Check the direction of the swipe based on the position of the
             # child relative to the immediate flickable container.
@@ -114,10 +118,6 @@
             else:
                 self.swipe_to_show_more_below(containers)
 
-            if self.contentY == original_content_y:
-                raise _common.ToolkitException(
-                    "Couldn't swipe in the flickable.")
-
     @autopilot_logging.log_action(logger.info)
     def swipe_to_show_more_above(self, containers=None):
         if self.atYBeginning:

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2014-10-01 16:51:32 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2014-10-23 13:45:32 +0000
@@ -14,10 +14,14 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import testtools
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
-from ubuntuuitoolkit._custom_proxy_objects import _common
 
 
 class FlickableTestCase(testtools.TestCase):
@@ -27,7 +31,7 @@
         dummy_id = (0, 0)
         dummy_flicking = (0, 'dummy')
         state_with_flicking = {'id': dummy_id, 'flicking': dummy_flicking}
-        element = _common.UbuntuUIToolkitCustomProxyObjectBase(
+        element = ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase(
             state_with_flicking, '/dummy'.encode(), 'dummy')
 
         with element.no_automatic_refreshing():
@@ -37,7 +41,7 @@
         """is_flickable returns False if flickable property doesn't exist."""
         dummy_id = (0, 0)
         state_without_flicking = {'id': dummy_id}
-        element = _common.UbuntuUIToolkitCustomProxyObjectBase(
+        element = ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase(
             state_without_flicking, '/dummy'.encode(), 'dummy')
 
         with element.no_automatic_refreshing():
@@ -213,6 +217,18 @@
         self.flickable.swipe_to_show_more_below()
         self.assertFalse(self.flickable.atYBeginning)
 
+    def test_failed_drag_must_raise_exception(self):
+        dummy_coordinates = (0, 0, 10, 10)
+        # Patch the pointing device so it does nothing and the swipe fails.
+        with mock.patch.object(self.flickable, 'pointing_device'):
+            error = self.assertRaises(
+                ubuntuuitoolkit.ToolkitException,
+                self.flickable._slow_drag,
+                *dummy_coordinates
+            )
+
+        self.assertEqual('Could not swipe in the flickable.', str(error))
+
 
 class UnityFlickableTestCase(tests.QMLStringAppTestCase):