← Back to branch summary

~veebers/autopilot/texttest-run-uprefresh

~veebers/autopilot/texttest-run-uprefresh

Viewing all changes in revision 486.

Committer: Christopher Lee
Date: 2014-07-22 03:39:08 UTC
mfrom: (445.1.57 trunk)
Revision ID: chris.lee@canonical.com-20140722033908-bh3z2rnor1s235mf

Merge trunk + fix conflicts

files added:
autopilot/_fixtures.py

autopilot/_logging.py

autopilot/tests/functional/test_application_launcher.py

autopilot/tests/unit/test_fixtures.py

files modified:
autopilot/_debug.py

autopilot/application/_launcher.py

autopilot/display/_X11.py

autopilot/display/__init__.py

autopilot/globals.py

autopilot/process/_bamf.py

autopilot/run.py

autopilot/testcase.py

autopilot/testresult.py

autopilot/tests/functional/test_autopilot_functional.py

autopilot/tests/unit/test_application_launcher.py

autopilot/tests/unit/test_logging.py

autopilot/tests/unit/test_start_final_events.py

autopilot/tests/unit/test_testcase.py

autopilot/tests/unit/test_testresults.py

autopilot/vis/main_window.py

debian/rules

docs/conf.py

Show diffs side-by-side

added added

removed removed

autopilot/_debug.py

autopilot/_fixtures.py

autopilot/_logging.py

autopilot/application/_launcher.py

autopilot/display/_X11.py

autopilot/display/__init__.py

autopilot/globals.py

autopilot/process/_bamf.py

autopilot/run.py

autopilot/testcase.py

autopilot/testresult.py

autopilot/tests/functional/test_application_launcher.py

autopilot/tests/functional/test_autopilot_functional.py

autopilot/tests/unit/test_application_launcher.py

autopilot/tests/unit/test_fixtures.py

autopilot/tests/unit/test_logging.py

autopilot/tests/unit/test_start_final_events.py

autopilot/tests/unit/test_testcase.py

autopilot/tests/unit/test_testresults.py

autopilot/vis/main_window.py

Older »