Unity 8

Merge lp:~saviq/unity8/helper-retry-unlock into lp:unity8

  1. helper-retry-unlock
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Michał Sawicz
Approved revision: 588
Merged at revision: 588
Proposed branch: lp:~saviq/unity8/helper-retry-unlock
Merge into: lp:unity8
Diff against target: 28 lines (+17/-1)
1 file modified
tests/autopilot/unity8/process_helpers.py (+17/-1)
To merge this branch: bzr merge lp:~saviq/unity8/helper-retry-unlock
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Christopher Lee (community) Approve
Review via email: mp+198648@code.launchpad.net

Commit message

Retry unlocking the greeter three times.

To post a comment you must log in.
lp:~saviq/unity8/helper-retry-unlock updated
587. By Michał Sawicz

Add comment and bug ref.

Revision history for this message
Christopher Lee (veebers) wrote :

LGTM

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

FAILED: Continuous integration, rev:586
http://jenkins.qa.ubuntu.com/job/unity8-ci/1872/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1620/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/638/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/395/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/396/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/395/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1620/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1563/console

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

review: Needs Fixing (continuous-integration)
lp:~saviq/unity8/helper-retry-unlock updated
588. By Michał Sawicz

Fix whitespace.

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

FAILED: Continuous integration, rev:588
http://jenkins.qa.ubuntu.com/job/unity8-ci/1873/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1622
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1564
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/396
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/397
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/397/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/396
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1622
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1622/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1564
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1564/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4081
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2251

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:588
http://jenkins.qa.ubuntu.com/job/unity8-ci/1875/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1626
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1568
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/642
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/399
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/399/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1626
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1626/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1568
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1568/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4086
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2257

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:588
http://jenkins.qa.ubuntu.com/job/unity8-ci/1876/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/399
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/400
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/400/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/399
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1633
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1633/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1575
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1575/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4091
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2264

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

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:588
http://jenkins.qa.ubuntu.com/job/unity8-ci/1877/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1634
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1576
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/644
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/401
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/401/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1634
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1634/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1576
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1576/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4093
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2266

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity8/process_helpers.py'
2--- tests/autopilot/unity8/process_helpers.py 2013-11-20 16:19:07 +0000
3+++ tests/autopilot/unity8/process_helpers.py 2013-12-11 23:30:39 +0000
4@@ -69,7 +69,23 @@
5 greeter = main_window.get_greeter()
6 if greeter.created == False:
7 raise RuntimeWarning("Greeter appears to be already unlocked.")
8- greeter.swipe()
9+
10+ # Because of potential input jerkiness under heavy load,
11+ # retry unlocking the greeter two times.
12+ # https://bugs.launchpad.net/ubuntu/+bug/1260113
13+
14+ retries = 3
15+ while retries > 0:
16+ try:
17+ greeter.swipe()
18+ except AssertionError:
19+ retries -= 1
20+ if retries == 0:
21+ raise
22+ logger.info("Failed to unlock greeter, trying again...")
23+ else:
24+ logger.info("Greeter unlocked, continuing.")
25+ break
26
27
28 def restart_unity_with_testability(*args):

Subscribers

People subscribed via source and target branches