[Erp5-report] r15961 - /erp5/trunk/products/ERP5Type/tests/

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Aug 30 16:21:51 2007
New Revision: 15961

URL: http://svn.erp5.org?rev=15961&view=rev
Log:
r15716 broke the use of --save (test were executed, because makeSuite is not
used anylonguer).
Adapt ERP5TypeTestLoader to use 'dummy_test' prefix when run with --save


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

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=15961&r1=15960&r2=15961&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py Thu Aug 30 16:21:51 2007
@@ -701,11 +701,6 @@
                           % title) # run_unit_test depends on this string.
       raise
 
-from unittest import _makeLoader, TestSuite
-
-def dummy_makeSuite(testCaseClass, prefix='dummy_test', sortUsing=cmp, suiteClass=TestSuite):
-  return _makeLoader(prefix, sortUsing, suiteClass).loadTestsFromTestCase(testCaseClass)
-
 def dummy_setUp(self):
   '''
   This one is overloaded so that it dos not execute beforeSetUp and afterSetUp

Modified: erp5/trunk/products/ERP5Type/tests/runUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/runUnitTest.py?rev=15961&r1=15960&r2=15961&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/runUnitTest.py (original)
+++ erp5/trunk/products/ERP5Type/tests/runUnitTest.py Thu Aug 30 16:21:51 2007
@@ -144,6 +144,10 @@
 class ERP5TypeTestLoader(unittest.TestLoader):
   """Load test cases from the name passed on the command line.
   """
+  def __init__(self, save=0):
+    if save:
+      self.testMethodPrefix = 'dummy_test'
+
   def loadTestsFromName(self, name, module=None):
     """This method is here for compatibility with old style arguments.
     - It is possible to have the .py prefix for the test file
@@ -226,17 +230,18 @@
   # it is then possible to run the debugger by "import pdb; pdb.set_trace()"
   sys.path.insert(0, tests_framework_home)
 
-  # override unittest.makeSuite to skip all tests in save mode
-  # and PortalTestCase.setUp to skip beforeSetUp and afterSetUp
+  save = 0
+  # pass save=1 to test loader to skip all tests in save mode
+  # and monkeypatch PortalTestCase.setUp to skip beforeSetUp and afterSetUp
   if os.environ.get('erp5_save_data_fs'):
     from Products.ERP5Type.tests.ERP5TypeTestCase import \
-        dummy_makeSuite, dummy_setUp, dummy_tearDown
+                             dummy_setUp, dummy_tearDown
+    save = 1
     from Testing.ZopeTestCase.PortalTestCase import PortalTestCase
-    unittest.makeSuite = dummy_makeSuite
     PortalTestCase.setUp = dummy_setUp
     PortalTestCase.tearDown = dummy_tearDown
 
-  suite = ERP5TypeTestLoader().loadTestsFromNames(test_list)
+  suite = ERP5TypeTestLoader(save=save).loadTestsFromNames(test_list)
   return TestRunner().run(suite)
 
 def usage(stream, msg=None):