Merge lp:~coreygoldberg/autopilot/deps-remove-py33-mock into lp:~autopilot/autopilot/temp-dev
Proposed by
Corey Goldberg
Status: | Merged |
---|---|
Approved by: | Corey Goldberg |
Approved revision: | 511 |
Merged at revision: | 516 |
Proposed branch: | lp:~coreygoldberg/autopilot/deps-remove-py33-mock |
Merge into: | lp:~autopilot/autopilot/temp-dev |
Diff against target: |
381 lines (+29/-31) 28 files modified
autopilot/tests/functional/test_input_stack.py (+1/-1) autopilot/tests/functional/test_mouse_emulator.py (+1/-1) autopilot/tests/unit/test_application_environment.py (+1/-1) autopilot/tests/unit/test_application_launcher.py (+1/-1) autopilot/tests/unit/test_command_line_args.py (+1/-1) autopilot/tests/unit/test_config.py (+1/-1) autopilot/tests/unit/test_content.py (+1/-1) autopilot/tests/unit/test_debug.py (+1/-1) autopilot/tests/unit/test_input.py (+1/-1) autopilot/tests/unit/test_introspection.py (+1/-1) autopilot/tests/unit/test_introspection_backends.py (+1/-1) autopilot/tests/unit/test_introspection_dbus.py (+1/-1) autopilot/tests/unit/test_introspection_object_registry.py (+1/-1) autopilot/tests/unit/test_introspection_search.py (+1/-1) autopilot/tests/unit/test_platform.py (+1/-1) autopilot/tests/unit/test_process.py (+1/-1) autopilot/tests/unit/test_query_resolution.py (+1/-1) autopilot/tests/unit/test_run.py (+1/-1) autopilot/tests/unit/test_start_final_events.py (+1/-1) autopilot/tests/unit/test_test_fixtures.py (+1/-1) autopilot/tests/unit/test_test_loader.py (+1/-1) autopilot/tests/unit/test_testcase.py (+1/-1) autopilot/tests/unit/test_testresults.py (+1/-1) autopilot/tests/unit/test_types.py (+1/-1) autopilot/tests/unit/test_utilities.py (+1/-1) autopilot/tests/unit/test_version_utility_fns.py (+1/-1) autopilot/tests/unit/test_vis_bus_enumerator.py (+1/-1) debian/control (+2/-4) |
To merge this branch: | bzr merge lp:~coreygoldberg/autopilot/deps-remove-py33-mock |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Thomi Richards (community) | Approve | ||
Review via email: mp+220205@code.launchpad.net |
Commit message
bump python version to 3.4 and remove python3-mock dependency
Description of the change
- bump python version to 3.4, since it is what shipped in Trusty
- remove python3-mock, since mock is included in python 3.4
- change importw from 'mock' to 'unittest.mock'
To post a comment you must log in.
FAILED: Continuous integration, rev:509 jenkins. qa.ubuntu. com/job/ autopilot- autopilot- temp-dev- ci/81/ jenkins. qa.ubuntu. com/job/ autopilot- autopilot- temp-dev- utopic- amd64-ci/ 39/console jenkins. qa.ubuntu. com/job/ autopilot- autopilot- temp-dev- utopic- armhf-ci/ 39/console jenkins. qa.ubuntu. com/job/ autopilot- autopilot- temp-dev- utopic- i386-ci/ 39/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic- autopilot/ 79/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/376/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/autopilot- autopilot- temp-dev- ci/81/rebuild
http://