Rev 3330: merge down-thread in file:///v/home/vila/src/bzr/experimental/faster-selftest/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 3330
revision-id: v.ladeuil+lp at free.fr-20080331161740-xkq01oxg8s067gfi
parent: v.ladeuil+lp at free.fr-20080331155314-3zo4giuszg1nvdwg
parent: v.ladeuil+lp at free.fr-20080331161703-0ueczeko01f5bf2v
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Mon 2008-03-31 18:17:40 +0200
message:
  merge down-thread
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3313.1.11
    revision-id: v.ladeuil+lp at free.fr-20080331161703-0ueczeko01f5bf2v
    parent: v.ladeuil+lp at free.fr-20080330202852-doh9ipbxw6zewnc7
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: filter-by-module-test-loader
    timestamp: Mon 2008-03-31 18:17:03 +0200
    message:
      Add an optional loader parameter needed when deploying the test
      loader for parametrized inventory_implementations and
      repository_implementations tests.
      
      * bzrlib/tests/__init__.py:
      (multiply_tests_from_modules): Add an optional loader parameter.
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-31 15:53:14 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-31 16:17:40 +0000
@@ -2866,7 +2866,7 @@
     return suite
 
 
-def multiply_tests_from_modules(module_name_list, scenario_iter):
+def multiply_tests_from_modules(module_name_list, scenario_iter, loader=None):
     """Adapt all tests in some given modules to given scenarios.
 
     This is the recommended public interface for test parameterization.
@@ -2878,6 +2878,8 @@
         modules.
     :param scenario_iter: Iterable of pairs of (scenario_name, 
         scenario_param_dict).
+    :param loader: If provided, will be used instead of a new 
+        bzrlib.tests.TestLoader() instance.
 
     This returns a new TestSuite containing the cross product of
     all the tests in all the modules, each repeated for each scenario.
@@ -2899,8 +2901,13 @@
     >>> tests[1].param
     2
     """
-    loader = TestLoader()
-    suite = TestSuite()
+    # XXX: Isn't load_tests() a better way to provide the same functionality
+    # without forcing a predefined TestScenarioApplier ? --vila 080215
+    if loader is None:
+        loader = TestUtil.TestLoader()
+
+    suite = loader.suiteClass()
+
     adapter = TestScenarioApplier()
     adapter.scenarios = list(scenario_iter)
     adapt_modules(module_name_list, adapter, loader, suite)