bzr.log.plugins Reverted blackbox fixes

[John A Meinel]

Hey Erik-

I was looking at my integration branch, and I found that my blackbox
tests were loading the wrong way.
Specifically the change was:
                      ]
-from bzrlib.tests import (TestLoader, TestSuite, _load_module_by_name,
-                          TestCaseInTempDir, BzrTestBase)
+from bzrlib.tests import TestLoader
+from bzrlib.tests import TestCaseInTempDir, BzrTestBase

 def test_suite():
     testmod_names = [
                      'bzrlib.tests.blackbox.test_added',
-                     'bzrlib.tests.blackbox.test_ancestry',
                      'bzrlib.tests.blackbox.test_cat',
                      'bzrlib.tests.blackbox.test_diff',
                      'bzrlib.tests.blackbox.test_export',
-                     'bzrlib.tests.blackbox.test_find_merge_base',
-                     'bzrlib.tests.blackbox.test_log',
+                     'bzrlib.tests.blackbox.test_logformats',
                      'bzrlib.tests.blackbox.test_missing',
                      'bzrlib.tests.blackbox.test_outside_wt',
                      'bzrlib.tests.blackbox.test_pull',
@@ -48,13 +46,7 @@
                      'bzrlib.tests.blackbox.test_upgrade',
                      'bzrlib.tests.blackbox.test_versioning',
                      ]
-
-    suite = TestSuite()
-    loader = TestLoader()
-    for mod_name in testmod_names:
-        mod = _load_module_by_name(mod_name)
-        suite.addTest(loader.loadTestsFromModule(mod))
-    return suite
+    return TestLoader().loadTestsFromNames(testmod_names)

Now, to me, that looks like you reverted a lot of good changes (you
moved from using a single import into using 2, and you removed 3 tests
just to add 1, and you removed the new loading code).

My guess is that this happened because you used something like "bzr
revert" on bzrlib/tests/blackbox/__init__.py" after doing the merge, and
then added your test.

The reason I missed it, was that I checked your changes before the
merge, and then after the merge, because I didn't want to check all of
my own changes in the middle.

Anyway, it means I need to go back and re-review all of your changes
that I merged, since I missed at least this part.

For now, I'm just going to pop off the commits, thereby removing the
merge from you, as I don't have time to review your log.plugins work
again right now. If you can give your work a closer review, especially
the point where you merged my tree, I would appreciate it.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060215/3c3b2487/attachment.pgp