Merge lp://staging/~barry/autopilot/lp1488175 into lp://staging/autopilot
Proposed by
Barry Warsaw
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp://staging/~barry/autopilot/lp1488175 | ||||
Merge into: | lp://staging/autopilot | ||||
Diff against target: |
912 lines (+242/-119) (has conflicts) 23 files modified
autopilot/introspection/_xpathselect.py (+4/-7) autopilot/process/_bamf.py (+4/-2) autopilot/run.py (+8/-8) autopilot/testcase.py (+2/-2) autopilot/tests/functional/test_ap_apps.py (+2/-1) autopilot/tests/functional/test_autopilot_functional.py (+4/-2) autopilot/tests/functional/test_dbus_query.py (+8/-10) autopilot/tests/functional/test_input_stack.py (+9/-1) autopilot/tests/unit/test_application_launcher.py (+11/-10) autopilot/tests/unit/test_input.py (+4/-1) autopilot/tests/unit/test_introspection_dbus.py (+4/-1) autopilot/tests/unit/test_introspection_xpathselect.py (+33/-19) autopilot/tests/unit/test_pick_backend.py (+20/-17) autopilot/tests/unit/test_platform.py (+2/-1) autopilot/tests/unit/test_process.py (+2/-2) autopilot/tests/unit/test_stagnate_state.py (+6/-3) autopilot/tests/unit/test_test_loader.py (+4/-3) autopilot/tests/unit/test_testcase.py (+5/-4) autopilot/tests/unit/test_types.py (+17/-8) autopilot/vis/dbus_search.py (+10/-6) debian/changelog (+73/-5) docs/otto.py (+1/-4) setup.py (+9/-2) Text conflict in autopilot/tests/functional/test_input_stack.py Text conflict in setup.py |
||||
To merge this branch: | bzr merge lp://staging/~barry/autopilot/lp1488175 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Autopilot Hackers | Pending | ||
Review via email: mp+268967@code.staging.launchpad.net |
Description of the change
My take on fixing the flake8 failures.
To post a comment you must log in.
Unmerged revisions
- 519. By Barry Warsaw
-
A few more flake8 fixes.
- 518. By Barry Warsaw
-
Mass fix for LP: #1488175
FAILED: Continuous integration, rev:519 /code.launchpad .net/~barry/ autopilot/ lp1488175/ +merge/ 268967/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// jenkins. qa.ubuntu. com/job/ autopilot- ci/1133/ jenkins. qa.ubuntu. com/job/ autopilot- wily-amd64- ci/63/console jenkins. qa.ubuntu. com/job/ autopilot- wily-armhf- ci/62/console jenkins. qa.ubuntu. com/job/ autopilot- wily-i386- ci/63/console
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/autopilot- ci/1133/ rebuild
http://