webbrowser-app

Merge lp:~osomon/webbrowser-app/workaround-1526940 into lp:webbrowser-app

  1. workaround-1526940
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Michael Sheldon
Approved revision: 1298
Merged at revision: 1299
Proposed branch: lp:~osomon/webbrowser-app/workaround-1526940
Merge into: lp:webbrowser-app
Diff against target: 15 lines (+4/-1)
1 file modified
tests/unittests/qml/WebbrowserTestCase.qml (+4/-1)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/workaround-1526940
Reviewer Review Type Date Requested Status
Michael Sheldon (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+280771@code.launchpad.net

Commit message

Work around what appears to be a regression in the UITK by specifying a non-null delay when swiping a list item to delete it in unit tests.

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

FAILED: Continuous integration, rev:1298
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2542/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5841/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1296
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1296/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1296
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4505/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5854
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5854/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26139

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2542/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Looks good, and makes the tests reliable again (the CI failures are unrelated, caused by libubuntugestures5 attempting to overwrite a file in libubuntugestures)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/unittests/qml/WebbrowserTestCase.qml'
2--- tests/unittests/qml/WebbrowserTestCase.qml 2015-11-17 17:19:13 +0000
3+++ tests/unittests/qml/WebbrowserTestCase.qml 2015-12-16 21:29:34 +0000
4@@ -48,7 +48,10 @@
5 }
6
7 function swipeToDeleteAndConfirm(listitem) {
8- flick(listitem, listitem.width / 10, listitem.height / 2, listitem.width / 2, 0)
9+ flick(listitem,
10+ listitem.width / 10, listitem.height / 2, listitem.width / 2, 0,
11+ // work around https://launchpad.net/bugs/1526940 by specifying a non-null delay
12+ -1, -1, Qt.LeftButton, Qt.NoModifiers, 1)
13 var confirm = findChild(listitem, "actionbutton_leadingAction.delete")
14 clickItem(confirm)
15 }

Subscribers

People subscribed via source and target branches

to status/vote changes: