Merge lp://staging/~brendan-donegan/ubuntu-autopilot-tests/bug1297295 into lp://staging/ubuntu-autopilot-tests
Proposed by
Brendan Donegan
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~brendan-donegan/ubuntu-autopilot-tests/bug1297295 |
Merge into: | lp://staging/ubuntu-autopilot-tests |
Diff against target: |
1125 lines (+1040/-0) (has conflicts) 16 files modified
.bzr-builddeb/default.conf (+2/-0) COPYING (+674/-0) README (+12/-0) debian/changelog (+5/-0) debian/compat (+1/-0) debian/control (+30/-0) debian/copyright (+28/-0) debian/rules (+13/-0) debian/source/format (+1/-0) debian/ubuntu-experience-tests.install (+1/-0) ubuntu_experience_tests/__init__.py (+17/-0) ubuntu_experience_tests/fixture_setup.py (+30/-0) ubuntu_experience_tests/helpers.py (+66/-0) ubuntu_experience_tests/tests/__init__.py (+32/-0) ubuntu_experience_tests/tests/test_fixture_setup.py (+56/-0) ubuntu_experience_tests/tests/test_osd_dialer_integration.py (+72/-0) Conflict adding file debian. Moved existing file to debian.moved. |
To merge this branch: | bzr merge lp://staging/~brendan-donegan/ubuntu-autopilot-tests/bug1297295 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Testcase Admins | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2014-05-29.
Description of the change
w
To post a comment you must log in.
Unmerged revisions
- 44. By Brendan Donegan
-
Update to use new helpers which will be in address-book-app and fix imports
- 43. By Brendan Donegan
-
Remove accidently added mtp test code
- 42. By Brendan Donegan
-
Use messaging fixture and UbuntuExperienc
eTestCase - 41. By Brendan Donegan
-
Use TestabilityEnvi
ronment from this project - 40. By Brendan Donegan
-
Use toolkit base class to get proxy object, and fix the expected result of the test.
- 39. By Brendan Donegan
-
Merged from trunk
- 38. By Brendan Donegan
-
Cleaned flake8 errors
- 37. By Brendan Donegan
-
Added test_mtp_
transfer. py - 36. By Brendan Donegan
-
Tidy up comments
- 35. By Brendan Donegan
-
Removed contactsdb directory since it wasn't used