Merge lp://staging/autopilot into lp://staging/autopilot/1.5

Proposed by Christopher Lee
Status: Merged
Merged at revision: 505
Proposed branch: lp://staging/autopilot
Merge into: lp://staging/autopilot/1.5
Diff against target: 2559 lines (+1468/-250) (has conflicts)
33 files modified
README (+61/-3)
autopilot/_config.py (+8/-8)
autopilot/input/_X11.py (+4/-1)
autopilot/input/__init__.py (+52/-12)
autopilot/input/_uinput.py (+11/-4)
autopilot/process/__init__.py (+5/-5)
autopilot/testresult.py (+37/-22)
autopilot/tests/functional/test_input_stack.py (+78/-17)
autopilot/tests/functional/test_introspection_features.py (+2/-1)
autopilot/tests/functional/test_process_emulator.py (+21/-2)
autopilot/tests/unit/fixtures.py (+41/-0)
autopilot/tests/unit/test_config.py (+11/-1)
autopilot/tests/unit/test_input.py (+18/-5)
autopilot/tests/unit/test_testresults.py (+56/-2)
autopilot/tests/unit/test_utilities.py (+132/-0)
autopilot/utilities.py (+127/-0)
debian/changelog (+109/-48)
debian/python3-autopilot.docs (+1/-0)
debian/rules (+1/-0)
docs/_templates/indexcontent.html (+79/-43)
docs/contents.rst (+5/-0)
docs/faq/faq.rst (+17/-22)
docs/faq/troubleshooting.rst (+38/-7)
docs/guides/good_tests.rst (+6/-0)
docs/guides/installation.rst (+42/-0)
docs/guides/page_object.rst (+226/-0)
docs/guides/running_ap.rst (+36/-8)
docs/index.rst (+10/-6)
docs/man.rst (+7/-7)
docs/porting/porting.rst (+3/-0)
docs/tutorial/advanced_autopilot.rst (+215/-17)
docs/tutorial/getting_started.rst (+9/-6)
docs/tutorial/tutorial.rst (+0/-3)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://staging/autopilot
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Autopilot Hackers Pending
Review via email: mp+250402@code.staging.launchpad.net

Commit message

Autopilot Release February 20th 2015.

Description of the change

Autopilot Release February 20th 2015.

- Fix for extension base classe (lp:1376996)
- Fix for desktop file name change (lp:1411096)
- Fix for config value containing '=' char (lp:1408317)
- Fix for skipped tests not appearing in log (lp:1414632)
- Add json docs build (for web publish) (lp:1409778)
- Documentation improvements for API, Tutorial, FAQ, and Guidelines

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

PASSED: Continuous integration, rev:542
http://jenkins.qa.ubuntu.com/job/autopilot-1.5-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-amd64-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-amd64-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-i386-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-i386-ci/1/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/114
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1460
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1460/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/751
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/751/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-1.5-ci/15/rebuild

review: Approve (continuous-integration)
lp://staging/autopilot updated
543. By Christopher Lee

Revert previous fix to unblock landing of other fixes and documentation updates.

Approved by PS Jenkins bot, Thomi Richards.

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

PASSED: Continuous integration, rev:543
http://jenkins.qa.ubuntu.com/job/autopilot-1.5-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-amd64-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-amd64-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-i386-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-i386-ci/2/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/116
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1542
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1542/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/770
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/770/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-1.5-ci/16/rebuild

review: Approve (continuous-integration)
lp://staging/autopilot updated
544. By Christopher Lee

Update debian/changelog for a better log for release.

Approved by PS Jenkins bot, Max Brustkern.

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

PASSED: Continuous integration, rev:544
http://jenkins.qa.ubuntu.com/job/autopilot-1.5-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-amd64-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-amd64-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-i386-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-vivid-i386-ci/3/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1569
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/117
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1567
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/779
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/779/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-1.5-ci/17/rebuild

review: Approve (continuous-integration)

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