Merge lp://staging/autopilot into lp://staging/autopilot/1.5
Proposed by
Christopher Lee
Status: | Merged |
---|---|
Approved by: | Selene ToyKeeper |
Approved revision: | 572 |
Merged at revision: | 524 |
Proposed branch: | lp://staging/autopilot |
Merge into: | lp://staging/autopilot/1.5 |
Diff against target: |
328 lines (+74/-49) 10 files modified
autopilot/_logging.py (+5/-4) autopilot/_video.py (+2/-2) autopilot/application/_launcher.py (+7/-4) autopilot/content.py (+11/-2) autopilot/introspection/types.py (+7/-30) autopilot/tests/unit/test_platform.py (+2/-2) autopilot/tests/unit/test_utilities.py (+16/-0) autopilot/utilities.py (+20/-0) debian/control (+2/-0) docs/otto.py (+2/-5) |
To merge this branch: | bzr merge lp://staging/autopilot |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt (community) | packaging | Approve | |
Selene ToyKeeper (community) | Approve | ||
Max Brustkern (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+279219@code.staging.launchpad.net |
Commit message
Stops attempts to access NoneType instead of bytes''. Considered a workaround, fixed in newer testtools.
Description of the change
Provide a workaround due to older versions of testtools on vivid. Stops attempts to access NoneType instead of bytes''
To post a comment you must log in.
PASSED: Continuous integration, rev:572 jenkins. qa.ubuntu. com/job/ autopilot- 1.5-ci/ 42/ jenkins. qa.ubuntu. com/job/ autopilot- 1.5-wily- amd64-ci/ 16 jenkins. qa.ubuntu. com/job/ autopilot- 1.5-wily- amd64-ci/ 16/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ autopilot- 1.5-wily- armhf-ci/ 16 jenkins. qa.ubuntu. com/job/ autopilot- 1.5-wily- armhf-ci/ 16/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ autopilot- 1.5-wily- i386-ci/ 16 jenkins. qa.ubuntu. com/job/ autopilot- 1.5-wily- i386-ci/ 16/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- wily-touch/ 977 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- wily-touch/ 544 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- wily-armhf/ 977 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- wily-armhf/ 977/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 25693
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/autopilot- 1.5-ci/ 42/rebuild
http://