[Erp5-report] r41875 romain - /erp5/trunk/products/ERP5Type/tests/

[nobody at svn.erp5.org]

Author: romain
Date: Thu Dec 30 13:28:04 2010
New Revision: 41875

URL: http://svn.erp5.org?rev=41875&view=rev
Log:
Do not propage parameter by saving class attribute. Update API and save
parameter on class's instance instead.
This will prevent 2 class instances to run in the same environnment.

Modified:
    erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py
    erp5/trunk/products/ERP5Type/tests/runUnitTest.py

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py?rev=41875&r1=41874&r2=41875&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py [utf8] Thu Dec 30 13:28:04 2010
@@ -467,11 +467,11 @@ def runLiveTest(test_list, verbosity=1, 
         result = super(DebugTextTestRunner, self)._makeResult()
         return DebugTestResult(result)
     TestRunner = DebugTextTestRunner
+  loader = ERP5TypeTestLoader()
   run_only = kw.get('run_only', None)
   if run_only is not None:
-    ERP5TypeTestLoader.filter_test_list = [re.compile(x).search
-                                            for x in run_only.split(',')]
-  suite = ERP5TypeTestLoader().loadTestsFromNames(test_list)
+    loader.filter_test_list = [re.compile(x).search for x in run_only.split(',')]
+  suite = loader.loadTestsFromNames(test_list)
   output = stream
   if stream is None:
     output = StringIO()

Modified: erp5/trunk/products/ERP5Type/tests/runUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/runUnitTest.py?rev=41875&r1=41874&r2=41875&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] Thu Dec 30 13:28:04 2010
@@ -347,7 +347,7 @@ class DebugTestResult:
 
 _print = sys.stderr.write
 
-def runUnitTestList(test_list, verbosity=1, debug=0):
+def runUnitTestList(test_list, verbosity=1, debug=0, run_only=None):
   if "zeo_client" in os.environ and "zeo_server" in os.environ:
     _print("conflicting options: --zeo_client and --zeo_server")
     sys.exit(1)
@@ -506,7 +506,12 @@ def runUnitTestList(test_list, verbosity
             result = super(DebugTextTestRunner, self)._makeResult()
             return DebugTestResult(result)
         TestRunner = DebugTextTestRunner
-      suite = ERP5TypeTestLoader().loadTestsFromNames(test_list)
+      loader = ERP5TypeTestLoader()
+      if run_only:
+        loader.filter_test_list = [re.compile(x).search for x in
+            run_only.split(',')]
+
+      suite = loader.loadTestsFromNames(test_list)
 
     if not isinstance(Storage, ClientStorage):
       # Remove nodes that were registered during previous execution.
@@ -617,6 +622,7 @@ def main():
   os.environ["erp5_tests_recreate_catalog"] = "0"
   verbosity = 1
   debug = 0
+  run_only = None
   instance_home = os.path.join(real_instance_home, 'unit_test')
 
   for opt, arg in opts:
@@ -663,8 +669,7 @@ def main():
     elif opt == "--erp5_catalog_storage":
       os.environ["erp5_catalog_storage"] = arg
     elif opt == "--run_only":
-      ERP5TypeTestLoader.filter_test_list = [re.compile(x).search
-                                             for x in arg.split(',')]
+      run_only = arg
     elif opt == "--update_only":
       os.environ["update_only"] = arg
       os.environ["update_business_templates"] = "1"
@@ -712,7 +717,9 @@ def main():
 
   result = runUnitTestList(test_list=args,
                            verbosity=verbosity,
-                           debug=debug)
+                           debug=debug,
+                           run_only=run_only,
+                           )
   try:
     from Testing.ZopeTestCase import profiler
   except ImportError: