Merge lp:~lifeless/launchpad/bug-745738 into lp:launchpad

Proposed by Robert Collins
Status: Merged
Approved by: Robert Collins
Approved revision: no longer in the source branch.
Merged at revision: 12708
Proposed branch: lp:~lifeless/launchpad/bug-745738
Merge into: lp:launchpad
Diff against target: 16 lines (+1/-8)
1 file modified
lib/launchpad_loggerhead/tests.py (+1/-8)
To merge this branch: bzr merge lp:~lifeless/launchpad/bug-745738
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+55670@code.launchpad.net

Commit message

Disable loggerheads external test suite.

Description of the change

Less test failures win.

To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/launchpad_loggerhead/tests.py'
2--- lib/launchpad_loggerhead/tests.py 2011-03-25 14:24:00 +0000
3+++ lib/launchpad_loggerhead/tests.py 2011-03-31 03:35:45 +0000
4@@ -306,11 +306,4 @@
5
6
7 def test_suite():
8- from bzrlib import tests as bzrlib_tests
9- from loggerhead import tests as loggerhead_tests
10-
11- loader = bzrlib_tests.TestLoader()
12- suite = loader.suiteClass()
13- suite = loggerhead_tests.load_tests(suite, loggerhead_tests, loader)
14- suite.addTests(loader.loadTestsFromName(__name__))
15- return suite
16+ return unittest.TestLoader().loadTestsFromName(__name__)