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

Proposed by Nicholas Skaggs
Status: Merged
Merged at revision: 1159
Proposed branch: lp:~nskaggs/ubuntu-ui-toolkit/fix-1328600
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 84 lines (+31/-12)
2 files modified
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py (+9/-6)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py (+22/-6)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-ui-toolkit/fix-1328600
Reviewer Review Type Date Requested Status
Leo Arias (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu SDK team Pending
Review via email: mp+227394@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

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

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

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.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

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

1156. By Nicholas Skaggs

workaround for bug 1346669

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Leo Arias (elopio) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
127 if not self._is_time_picker():127 if not self._is_time_picker():
128 raise _common.ToolkitException(128 raise _common.ToolkitException(
129 "Can't pick time. The picker mode is: {!r}.".format(self.mode))129 "Can't pick time. The picker mode is: {!r}.".format(self.mode))
130 # Workaround https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1346669
131 # By setting seconds, then minutes, then hours, erratic behavoir
132 # can be dealt with
133 if 'Seconds' in self.mode:
134 self._pick_second(time.second)
135 self.seconds.wait_for(time.second)
136 if 'Minutes' in self.mode:
137 self._pick_minute(time.minute)
138 self.minutes.wait_for(time.minute)
130 if 'Hours' in self.mode:139 if 'Hours' in self.mode:
131 self._pick_hour(time.hour)140 self._pick_hour(time.hour)
132 self.hours.wait_for(time.hour)141 self.hours.wait_for(time.hour)
133 if 'Minutes' in self.mode:
134 self._pick_minute(time.minute)
135 self.minutes.wait_for(time.minute)
136 if 'Seconds' in self.mode:
137 self._pick_second(time.second)
138 self.seconds.wait_for(time.second)
139142
140 def _is_time_picker(self):143 def _is_time_picker(self):
141 mode = self.mode144 mode = self.mode
142145
=== 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 @@
36 id: datePicker36 id: datePicker
37 objectName: 'datePicker'37 objectName: 'datePicker'
38 mode: 'Years|Months|Days'38 mode: 'Years|Months|Days'
39 maximum: {
40 var d = new Date()
41 d.setFullYear('2030')
42 return d
43 }
44 minimum: {
45 var d = new Date()
46 d.setFullYear('1990')
47 return d
48 }
39 date: {49 date: {
40 var d = new Date()50 var d = new Date()
41 // Make sure that the picker will have higher and lower values51 d.setFullYear('2010')
42 // to select.
43 d.setFullYear(d.getFullYear() + 25)
44 d.setMonth('5')52 d.setMonth('5')
45 d.setDate('15')53 d.setDate('15')
46 return d54 return d
@@ -50,10 +58,18 @@
50 id: timePicker58 id: timePicker
51 objectName: 'timePicker'59 objectName: 'timePicker'
52 mode: 'Hours|Minutes|Seconds'60 mode: 'Hours|Minutes|Seconds'
61 maximum: {
62 var d = new Date()
63 d.setFullYear('2030')
64 return d
65 }
66 minimum: {
67 var d = new Date()
68 d.setFullYear('1990')
69 return d
70 }
53 date: {71 date: {
54 var d = new Date()72 var d = new Date()
55 // Make sure that the picker will have higher and lower values
56 // to select.
57 d.setHours(12)73 d.setHours(12)
58 d.setMinutes('30')74 d.setMinutes('30')
59 d.setSeconds('30')75 d.setSeconds('30')
@@ -133,7 +149,7 @@
133149
134class PickDateFromDatePickerTestCase(DatePickerBaseTestCase):150class PickDateFromDatePickerTestCase(DatePickerBaseTestCase):
135151
136 SELECTED_YEAR = datetime.date.today().year + 25152 SELECTED_YEAR = 2010
137 SELECTED_MONTH = 6 # June153 SELECTED_MONTH = 6 # June
138 SELECTED_DAY = 15154 SELECTED_DAY = 15
139155

Subscribers

People subscribed via source and target branches