← Back to team overview

launchpad-reviewers team mailing list archive

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

 

John A Meinel has proposed merging lp:~jameinel/launchpad/loggerhead-test-suite-742446 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #742446 in Launchpad itself: "Launchpad should include loggerhead's test suite"
  https://bugs.launchpad.net/launchpad/+bug/742446

For more details, see:
https://code.launchpad.net/~jameinel/launchpad/loggerhead-test-suite-742446/+merge/54870

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.

-- 
https://code.launchpad.net/~jameinel/launchpad/loggerhead-test-suite-742446/+merge/54870
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jameinel/launchpad/loggerhead-test-suite-742446 into lp:launchpad.
=== modified file 'lib/launchpad_loggerhead/tests.py'
--- lib/launchpad_loggerhead/tests.py	2011-03-10 18:27:08 +0000
+++ lib/launchpad_loggerhead/tests.py	2011-03-25 14:32:34 +0000
@@ -306,4 +306,11 @@
 
 
 def test_suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)
+    from bzrlib import tests as bzrlib_tests
+    from loggerhead import tests as loggerhead_tests
+
+    loader = bzrlib_tests.TestLoader()
+    suite = loader.suiteClass()
+    suite = loggerhead_tests.load_tests(suite, loggerhead_tests, loader)
+    suite.addTests(loader.loadTestsFromName(__name__))
+    return suite

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2011-03-25 12:59:22 +0000
+++ utilities/sourcedeps.conf	2011-03-25 14:32:34 +0000
@@ -6,7 +6,7 @@
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
 dulwich lp:~launchpad-pqm/dulwich/devel;revno=424
 difftacular lp:difftacular;revno=6
-loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=443
+loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=445
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
 mailman lp:~launchpad-pqm/mailman/2.1;revno=976
 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4