Rev 3329: bzrlib.tests.workingtree_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: 3329
revision-id: v.ladeuil+lp at free.fr-20080331155314-3zo4giuszg1nvdwg
parent: v.ladeuil+lp at free.fr-20080331154750-gr55mbtuz8ri3qmu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Mon 2008-03-31 17:53:14 +0200
message:
  bzrlib.tests.workingtree_implementations switched from
  test_suite() to load_tests().
  
  * bzrlib/tests/workingtree_implementations/__init__.py:
  (load_tests): Preferred to test_suite().
  
  * bzrlib/tests/__init__.py:
  (test_suite): bzrlib.tests.workingtree_implementations moved from
  packages_to_test to testmod_names.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-31 15:47:50 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-31 15:53:14 +0000
@@ -118,11 +118,9 @@
     """
     import bzrlib.tests.inventory_implementations
     import bzrlib.tests.repository_implementations
-    import bzrlib.tests.workingtree_implementations
     return [
             bzrlib.tests.inventory_implementations,
             bzrlib.tests.repository_implementations,
-            bzrlib.tests.workingtree_implementations,
             ]
 
 
@@ -2778,6 +2776,7 @@
                    'bzrlib.tests.test_wsgi',
                    'bzrlib.tests.test_xml',
                    'bzrlib.tests.tree_implementations',
+                   'bzrlib.tests.workingtree_implementations',
                    ]
     test_transport_implementations = [
         'bzrlib.tests.test_transport_implementations',

=== modified file 'bzrlib/tests/workingtree_implementations/__init__.py'
--- a/bzrlib/tests/workingtree_implementations/__init__.py	2007-07-12 07:22:52 +0000
+++ b/bzrlib/tests/workingtree_implementations/__init__.py	2008-03-31 15:53:14 +0000
@@ -27,9 +27,7 @@
 from bzrlib.tests import (
                           adapt_modules,
                           default_transport,
-                          TestLoader,
                           TestScenarioApplier,
-                          TestSuite,
                           )
 from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
 from bzrlib.workingtree import (WorkingTreeFormat,
@@ -78,8 +76,11 @@
         return self.workingtree_format.initialize(made_control)
 
 
-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_workingtree_implementations = [
         'bzrlib.tests.workingtree_implementations.test_add_reference',
         'bzrlib.tests.workingtree_implementations.test_add',
@@ -116,6 +117,7 @@
         'bzrlib.tests.workingtree_implementations.test_walkdirs',
         'bzrlib.tests.workingtree_implementations.test_workingtree',
         ]
+
     adapter = WorkingTreeTestProviderAdapter(
         default_transport,
         # None here will cause a readonly decorator to be created
@@ -123,6 +125,6 @@
         None,
         [(format, format._matchingbzrdir) for format in 
          WorkingTreeFormat._formats.values() + _legacy_formats])
-    loader = TestLoader()
+
     adapt_modules(test_workingtree_implementations, adapter, loader, result)
     return result