Rev 3321: bzrlib.tests.bzrdir_implementations switched from test_suite() to load_tests(). in file:///v/home/vila/src/bzr/experimental/faster-selftest/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/experimental/faster-selftest/

------------------------------------------------------------
revno: 3321
revision-id: v.ladeuil+lp at free.fr-20080330214156-y2eoufcgystpqtb2
parent: v.ladeuil+lp at free.fr-20080330213713-1fx909tx5sc8zqc0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Sun 2008-03-30 23:41:56 +0200
message:
  bzrlib.tests.bzrdir_implementations switched from test_suite() to load_tests().
  
  * bzrlib/tests/bzrdir_implementations/__init__.py:
  (load_tests): Preferred to test_suite().
  
  * bzrlib/tests/__init__.py:
  (test_suite): bzrlib.tests.bzrdir_implementations moved from
  packages_to_test to testmod_names.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-30 21:37:13 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-30 21:41:56 +0000
@@ -116,7 +116,6 @@
     The packages are not globally imported so that import failures are
     triggered when running selftest, not when importing the command.
     """
-    import bzrlib.tests.bzrdir_implementations
     import bzrlib.tests.commands
     import bzrlib.tests.interrepository_implementations
     import bzrlib.tests.interversionedfile_implementations
@@ -128,7 +127,6 @@
     import bzrlib.tests.tree_implementations
     import bzrlib.tests.workingtree_implementations
     return [
-            bzrlib.tests.bzrdir_implementations,
             bzrlib.tests.commands,
             bzrlib.tests.interrepository_implementations,
             bzrlib.tests.interversionedfile_implementations,
@@ -2658,6 +2656,7 @@
                    'bzrlib.util.tests.test_bencode',
                    'bzrlib.tests.blackbox',
                    'bzrlib.tests.branch_implementations',
+                   'bzrlib.tests.bzrdir_implementations',
                    'bzrlib.tests.test__dirstate_helpers',
                    'bzrlib.tests.test_ancestry',
                    'bzrlib.tests.test_annotate',

=== modified file 'bzrlib/tests/bzrdir_implementations/__init__.py'
--- a/bzrlib/tests/bzrdir_implementations/__init__.py	2007-06-28 06:01:18 +0000
+++ b/bzrlib/tests/bzrdir_implementations/__init__.py	2008-03-30 21:41:56 +0000
@@ -29,9 +29,7 @@
                           adapt_modules,
                           default_transport,
                           TestCaseWithTransport,
-                          TestLoader,
                           TestScenarioApplier,
-                          TestSuite,
                           )
 from bzrlib.transport.memory import MemoryServer
 
@@ -90,8 +88,11 @@
             relpath, format=self.bzrdir_format)
 
 
-def test_suite():
-    result = TestSuite()
+def load_tests(basic_tests, module, loader):
+    result = loader.suiteClass()
+    # add the tests for this module
+    result.addTests(basic_tests)
+
     test_bzrdir_implementations = [
         'bzrlib.tests.bzrdir_implementations.test_bzrdir',
         ]
@@ -103,16 +104,18 @@
         # by the TestCaseWithTransport.get_readonly_transport method.
         None,
         formats)
-    loader = TestLoader()
     adapt_modules(test_bzrdir_implementations, adapter, loader, result)
 
     # This will always add the tests for smart server transport, regardless of
     # the --transport option the user specified to 'bzr selftest'.
-    from bzrlib.smart.server import SmartTCPServer_for_testing, ReadonlySmartTCPServer_for_testing
+    from bzrlib.smart.server import (
+        SmartTCPServer_for_testing,
+        ReadonlySmartTCPServer_for_testing,
+        )
     from bzrlib.remote import RemoteBzrDirFormat
 
     # test the remote server behaviour using a MemoryTransport
-    smart_server_suite = TestSuite()
+    smart_server_suite = loader.suiteClass()
     adapt_to_smart_server = BzrDirTestProviderAdapter(
         MemoryServer,
         SmartTCPServer_for_testing,
@@ -120,7 +123,7 @@
         [(RemoteBzrDirFormat())])
     adapt_modules(test_bzrdir_implementations,
                   adapt_to_smart_server,
-                  TestLoader(),
+                  loader,
                   smart_server_suite)
     result.addTests(smart_server_suite)