webapps-demo

Merge lp://qastaging/~abreu-alexandre/webapps-demo/autopilot-tests-fixes into lp://qastaging/webapps-demo

  1. autopilot-tests-fixes
  2. Merge into trunk
Proposed by Alexandre Abreu
Status: Needs review
Proposed branch: lp://qastaging/~abreu-alexandre/webapps-demo/autopilot-tests-fixes
Merge into: lp://qastaging/webapps-demo
Diff against target: 361 lines (+53/-91) (has conflicts)
15 files modified
debian/changelog (+6/-0)
debian/control (+11/-2)
debian/postinst (+0/-21)
debian/rules (+10/-37)
debian/webapps-core-click-autopilot.install (+1/-0)
debian/webapps-demo-click.install (+0/-1)
tests/autopilot/setup.py (+1/-1)
tests/autopilot/webapps_click_packages_autopilot/tests/__init__.py (+11/-22)
tests/autopilot/webapps_click_packages_autopilot/tests/test_click_packages.py (+2/-2)
webapp-amazon/manifest.json (+2/-1)
webapp-ebay/manifest.json (+2/-1)
webapp-facebook/manifest.json (+2/-1)
webapp-gmail/manifest.json (+1/-0)
webapp-twitter/manifest.json (+2/-1)
webapp-ubuntuone/manifest.json (+2/-1)
Text conflict in debian/control
Text conflict in tests/autopilot/webapps_click_packages_autopilot/tests/__init__.py
To merge this branch: bzr merge lp://qastaging/~abreu-alexandre/webapps-demo/autopilot-tests-fixes
Reviewer Review Type Date Requested Status
Leo Arias (community) Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+206250@code.qastaging.launchpad.net

Commit message

Fixes to webapps-core AP

Description of the change

Fixes to webapps-core AP

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

FAILED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/34/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webapps-demo-ci/34/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Leo Arias (elopio) wrote :

Needs to be re-merged with trunk.

review: Needs Fixing
Reply

Unmerged revisions

38. By Alexandre Abreu

update to use click autopilot caps

37. By Alexandre Abreu

update to use click autopilot caps

36. By Alexandre Abreu

Fixes

35. By David Barth

rename to webapps-core and adjust AP test suite

34. By David Barth

merging in the autopilot test suite

33. By David Barth

specify architecture explicitely: all, and bump version numbers

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