Merge lp:~nskaggs/ubuntu-ui-toolkit/fix-1328600 into lp:ubuntu-ui-toolkit/staging

[Nicholas Skaggs]

Workaround bug 1328600 by setting min and max values for date and time pickers inside tests

Workaround bug 1328600 by setting min and max values for date and time pickers inside tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1155
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/623/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2204
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1839
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/455
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/455/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/455
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2414
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3377
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3377/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10092
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1543
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2057
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2057/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1155
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/628/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2246/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1863
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/460
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/460/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/460/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2451/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3430
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3430/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2082
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2082/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Kicking off a rebuild, as the failure seemed to occur because of the archive being in a bad state.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1155
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/634/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2271
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1883
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/466
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/466/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/466
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2468
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3464
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3464/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10174
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2102
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2102/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

I'm a bit confused why the PickTimeFromDatePickerTestCase show as failing as I didn't modify the testcase (though I did change the qml)

[Nicholas Skaggs (nskaggs)]

Turns out setting the minimum and maximum year trigger a bug where the hour picker moves when you select from the minute picker. When selecting things with the second picker, both the hour and minute pickers move.

[Nicholas Skaggs (nskaggs)]

Filed bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1346669. This should now pass and be ready to merge.

[lp:~nskaggs/ubuntu-ui-toolkit/fix-1328600]

1156. By Nicholas Skaggs on 2014-07-22

workaround for bug 1346669

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1156
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/636/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/468
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/468
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/468/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/468
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2478
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3481
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3481/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1585
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2105
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2105/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

review: Approve

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py	2014-05-09 05:39:20 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py	2014-07-22 00:06:44 +0000
@@ -127,15 +127,18 @@
         if not self._is_time_picker():
             raise _common.ToolkitException(
                 "Can't pick time. The picker mode is: {!r}.".format(self.mode))
+        # Workaround https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1346669
+        # By setting seconds, then minutes, then hours, erratic behavoir
+        # can be dealt with
+        if 'Seconds' in self.mode:
+            self._pick_second(time.second)
+            self.seconds.wait_for(time.second)
+        if 'Minutes' in self.mode:
+            self._pick_minute(time.minute)
+            self.minutes.wait_for(time.minute)
         if 'Hours' in self.mode:
             self._pick_hour(time.hour)
             self.hours.wait_for(time.hour)
-        if 'Minutes' in self.mode:
-            self._pick_minute(time.minute)
-            self.minutes.wait_for(time.minute)
-        if 'Seconds' in self.mode:
-            self._pick_second(time.second)
-            self.seconds.wait_for(time.second)
 
     def _is_time_picker(self):
         mode = self.mode

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py	2014-05-09 05:39:20 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py	2014-07-22 00:06:44 +0000
@@ -36,11 +36,19 @@
             id: datePicker
             objectName: 'datePicker'
             mode: 'Years|Months|Days'
+            maximum: {
+                var d = new Date()
+                d.setFullYear('2030')
+                return d
+            }
+            minimum: {
+                var d = new Date()
+                d.setFullYear('1990')
+                return d
+            }
             date: {
                 var d = new Date()
-                // Make sure that the picker will have higher and lower values
-                // to select.
-                d.setFullYear(d.getFullYear() + 25)
+                d.setFullYear('2010')
                 d.setMonth('5')
                 d.setDate('15')
                 return d
@@ -50,10 +58,18 @@
             id: timePicker
             objectName: 'timePicker'
             mode: 'Hours|Minutes|Seconds'
+            maximum: {
+                var d = new Date()
+                d.setFullYear('2030')
+                return d
+            }
+            minimum: {
+                var d = new Date()
+                d.setFullYear('1990')
+                return d
+            }
             date: {
                 var d = new Date()
-                // Make sure that the picker will have higher and lower values
-                // to select.
                 d.setHours(12)
                 d.setMinutes('30')
                 d.setSeconds('30')
@@ -133,7 +149,7 @@
 
 class PickDateFromDatePickerTestCase(DatePickerBaseTestCase):
 
-    SELECTED_YEAR = datetime.date.today().year + 25
+    SELECTED_YEAR = 2010
     SELECTED_MONTH = 6  # June
     SELECTED_DAY = 15