pay-ui

Merge lp://staging/~dobey/pay-ui/fix-page-returns into lp://staging/pay-ui

  1. fix-page-returns
  2. Merge into first-branch
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 134
Merged at revision: 135
Proposed branch: lp://staging/~dobey/pay-ui/fix-page-returns
Merge into: lp://staging/pay-ui
Diff against target: 104 lines (+29/-10)
6 files modified
HACKING (+5/-1)
app/payui.qml (+2/-0)
app/ui/UbuntuPurchaseWebkit.qml (+3/-8)
tests/autopilot/pay_ui/__init__.py (+7/-0)
tests/autopilot/pay_ui/tests/mock_server.py (+1/-1)
tests/autopilot/pay_ui/tests/test_pay_ui.py (+11/-0)
To merge this branch: bzr merge lp://staging/~dobey/pay-ui/fix-page-returns
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+275930@code.staging.launchpad.net

Commit message

Don't match on hostname, only the neccessary part of the path element.
Add a test for the return from add card page bug.
Update the instructions for running the autopilot tests.

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

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/144/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-14.09-touch/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-14.09-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-14.09-armhf-ci/4/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/939
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/42
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24627

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/144/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: