Merge lp:~jameinel/launchpad/loggerhead-test-suite-742446 into lp:launchpad

Proposed by John A Meinel
Status: Merged
Approved by: Abel Deuring
Approved revision: no longer in the source branch.
Merged at revision: 12674
Proposed branch: lp:~jameinel/launchpad/loggerhead-test-suite-742446
Merge into: lp:launchpad
Diff against target: 29 lines (+9/-2)
2 files modified
lib/launchpad_loggerhead/tests.py (+8/-1)
utilities/sourcedeps.conf (+1/-1)
To merge this branch: bzr merge lp:~jameinel/launchpad/loggerhead-test-suite-742446
Reviewer Review Type Date Requested Status
Abel Deuring (community) code Approve
Review via email: mp+54870@code.launchpad.net

Commit message

Include the loggerhead test suite as part of the Launchpad test suite.

Description of the change

This updates the Launchpad test suite to incorporate the Loggerhead test suite.

Now that the loggerhead test suite runs cleanly, it makes sense to run it as part of regular testing. I did check, and it would have caught:
https://bugs.launchpad.net/launchpad/+bug/742390

This way, we can be sure that loggerhead's test suite is being run in the same configuration that is being deployed.

The reason this change includes a bump to the revision of loggerhead, is because there was 1 fix needed in Loggerhead itself. (loggerhead runs both as a plugin of bzr and as a standalone app. Launchpad runs it as a standalone app, so it is not accessible as 'bzrlib.plugins.loggerhead'. One of the tests was assuming it was.)

This also includes Jelmer's bugfix to properly support foreign revisions (revno 434). I don't believe this is an issue in production, since I don't think we run loggerhead with bzr-svn available. (And if we did, then we should have been getting OOPses in production that his patch will fix.)

The update does expose: https://bugs.launchpad.net/loggerhead/+bug/742494
Which is that loggerhead's tests seem to be leaking threads. However, that doesn't seem to cause Launchpad's test runner to fail, and I don't know what that means for Launchpad's test suite.

To post a comment you must log in.
Revision history for this message
Abel Deuring (adeuring) :
review: Approve (code)

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-10 18:27:08 +0000
3+++ lib/launchpad_loggerhead/tests.py 2011-03-25 14:32:34 +0000
4@@ -306,4 +306,11 @@
5
6
7 def test_suite():
8- return unittest.TestLoader().loadTestsFromName(__name__)
9+ from bzrlib import tests as bzrlib_tests
10+ from loggerhead import tests as loggerhead_tests
11+
12+ loader = bzrlib_tests.TestLoader()
13+ suite = loader.suiteClass()
14+ suite = loggerhead_tests.load_tests(suite, loggerhead_tests, loader)
15+ suite.addTests(loader.loadTestsFromName(__name__))
16+ return suite
17
18=== modified file 'utilities/sourcedeps.conf'
19--- utilities/sourcedeps.conf 2011-03-25 12:59:22 +0000
20+++ utilities/sourcedeps.conf 2011-03-25 14:32:34 +0000
21@@ -6,7 +6,7 @@
22 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
23 dulwich lp:~launchpad-pqm/dulwich/devel;revno=424
24 difftacular lp:difftacular;revno=6
25-loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=443
26+loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=445
27 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
28 mailman lp:~launchpad-pqm/mailman/2.1;revno=976
29 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4