Rev 3324: bzrlib.tests.interversionedfile_implementations switched from in file:///v/home/vila/src/bzr/experimental/faster-selftest/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 3324
revision-id: v.ladeuil+lp at free.fr-20080330221056-jm3m65e78c5fusgk
parent: v.ladeuil+lp at free.fr-20080330220238-xzv9sf0z3wnzybaq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Mon 2008-03-31 00:10:56 +0200
message:
  bzrlib.tests.interversionedfile_implementations switched from
  test_suite() to load_tests().
  
  * bzrlib/tests/interversionedfile_implementations/__init__.py:
  (load_tests): Preferred to test_suite().
  
  * bzrlib/tests/__init__.py:
  (test_suite): bzrlib.tests.interversionedfile_implementations
  moved from packages_to_test to testmod_names.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-30 22:02:38 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-30 22:10: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.interversionedfile_implementations
     import bzrlib.tests.intertree_implementations
     import bzrlib.tests.inventory_implementations
     import bzrlib.tests.per_lock
@@ -125,7 +124,6 @@
     import bzrlib.tests.tree_implementations
     import bzrlib.tests.workingtree_implementations
     return [
-            bzrlib.tests.interversionedfile_implementations,
             bzrlib.tests.intertree_implementations,
             bzrlib.tests.inventory_implementations,
             bzrlib.tests.per_lock,
@@ -2655,6 +2653,7 @@
                    'bzrlib.tests.bzrdir_implementations',
                    'bzrlib.tests.commands',
                    'bzrlib.tests.interrepository_implementations',
+                   'bzrlib.tests.interversionedfile_implementations',
                    'bzrlib.tests.test__dirstate_helpers',
                    'bzrlib.tests.test_ancestry',
                    'bzrlib.tests.test_annotate',

=== modified file 'bzrlib/tests/interversionedfile_implementations/__init__.py'
--- a/bzrlib/tests/interversionedfile_implementations/__init__.py	2007-06-28 06:16:19 +0000
+++ b/bzrlib/tests/interversionedfile_implementations/__init__.py	2008-03-30 22:10:56 +0000
@@ -27,9 +27,7 @@
 from bzrlib.tests import (
                           adapt_modules,
                           default_transport,
-                          TestLoader,
                           TestScenarioApplier,
-                          TestSuite,
                           )
 
 
@@ -89,8 +87,11 @@
         return result
 
 
-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_interversionedfile_implementations = [
         'bzrlib.tests.interversionedfile_implementations.test_join',
         ]
@@ -101,6 +102,6 @@
         None,
         InterVersionedFileTestProviderAdapter.default_test_list()
         )
-    loader = TestLoader()
-    adapt_modules(test_interversionedfile_implementations, adapter, loader, result)
+    adapt_modules(test_interversionedfile_implementations,
+                  adapter, loader, result)
     return result