Merge lp:~jameinel/bzr/2.3-test-loader into lp:bzr

[John A Meinel]

Restore TestSuite and TestLoader as attributes of bzrlib.tests

Recently Vincent was cleaning up some imports (as part of cleaning up leaking threads in tests.)

He ended up removing bzrlib.tests.TestSuite/TestLoader (because they were from the TestUtil module).

However, I think it is very useful for plugins, etc to be able to just grab the things they need for testing from one location.

[Jelmer Vernooij (jelmer)]

review: Approve

[John A Meinel (jameinel)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-09-01 18:06:19 +0000
+++ NEWS	2010-09-02 20:21:00 +0000
@@ -154,6 +154,10 @@
   users to attach to their own processes by default.
   (Martin Pool, #626679)
 
+* Test classes like ``TestCase``, ``TestLoader``, and ``TestSuite`` should
+  be available from ``bzrlib.tests.*``. They used to be, but were
+  accidentally removed. (John Arbash Meinel, #627438)
+
 * ``Transport.stat`` on a symlink, including a transport pointing directly
   to a symlink, now returns information about the symlink.
   (Martin Pool)

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2010-08-30 07:42:12 +0000
+++ bzrlib/tests/__init__.py	2010-09-02 20:21:00 +0000
@@ -135,6 +135,10 @@
 SUBUNIT_SEEK_SET = 0
 SUBUNIT_SEEK_CUR = 1
 
+# These are intentionally brought into this namespace. That way plugins, etc
+# can just "from bzrlib.tests import TestCase, TestLoader, etc"
+TestSuite = TestUtil.TestSuite
+TestLoader = TestUtil.TestLoader
 
 class ExtendedTestResult(testtools.TextTestResult):
     """Accepts, reports and accumulates the results of running tests.

=== modified file 'bzrlib/tests/test_selftest.py'
--- bzrlib/tests/test_selftest.py	2010-08-17 22:24:01 +0000
+++ bzrlib/tests/test_selftest.py	2010-09-02 20:21:00 +0000
@@ -122,6 +122,19 @@
         self.failUnlessExists(filename)
 
 
+class TestClassesAvailable(tests.TestCase):
+    """As a convenience we expose Test* classes from bzrlib.tests"""
+
+    def test_test_case(self):
+        from bzrlib.tests import TestCase
+
+    def test_test_loader(self):
+        from bzrlib.tests import TestLoader
+
+    def test_test_suite(self):
+        from bzrlib.tests import TestSuite
+
+
 class TestTransportScenarios(tests.TestCase):
     """A group of tests that test the transport implementation adaption core.