[Erp5-report] r42926 jm - in /erp5/trunk: bt5/vifib_open_trade/TestTemplateItem/ bt5/vifib_...

[nobody at svn.erp5.org]

Author: jm
Date: Wed Feb  2 12:11:53 2011
New Revision: 42926

URL: http://svn.erp5.org?rev=42926&view=rev
Log:
ERP5TypeLiveTestCase: remove beforeClear

Modified:
    erp5/trunk/bt5/vifib_open_trade/TestTemplateItem/ViFiBOrderTest.py
    erp5/trunk/bt5/vifib_open_trade/bt/revision
    erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py

Modified: erp5/trunk/bt5/vifib_open_trade/TestTemplateItem/ViFiBOrderTest.py
URL: http://svn.erp5.org/erp5/trunk/bt5/vifib_open_trade/TestTemplateItem/ViFiBOrderTest.py?rev=42926&r1=42925&r2=42926&view=diff
==============================================================================
--- erp5/trunk/bt5/vifib_open_trade/TestTemplateItem/ViFiBOrderTest.py [utf8] (original)
+++ erp5/trunk/bt5/vifib_open_trade/TestTemplateItem/ViFiBOrderTest.py [utf8] Wed Feb  2 12:11:53 2011
@@ -132,11 +132,14 @@ class ViFiBOrderTest(ERP5TypeLiveTestCas
     # XXX
     #self.login('jp')    
 
-  def beforeClear(self):
-    """This method should be moved up to ERP5TypeLiveTestCase
-    or to a subclass of it
-    """
-    self.cleanupGarbage()
+  #def beforeClear(self):
+  #  """This method should be moved up to ERP5TypeLiveTestCase
+  #  or to a subclass of it
+  #
+  #  XXX beforeClear was removed from ERP5TypeLiveTestCase
+  #  XXX when should should cleanupGarbage be called ?
+  #  """
+  #  self.cleanupGarbage()
 
   def collectGarbage(self, document):
     """Keeps a list of documents to erase at the end of the test

Modified: erp5/trunk/bt5/vifib_open_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/vifib_open_trade/bt/revision?rev=42926&r1=42925&r2=42926&view=diff
==============================================================================
--- erp5/trunk/bt5/vifib_open_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/vifib_open_trade/bt/revision [utf8] Wed Feb  2 12:11:53 2011
@@ -1 +1 @@
-69
\ No newline at end of file
+70
\ No newline at end of file

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py?rev=42926&r1=42925&r2=42926&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py [utf8] Wed Feb  2 12:11:53 2011
@@ -118,38 +118,13 @@ class ERP5TypeLiveTestCase(ERP5TypeTestC
         self.portal.portal_activities.unsubscribe()
         self._setUpDummyMailHost()
 
-    def setUp(self):
-        '''Sets up the fixture. Do not override,
-           use the hooks instead.
-        '''
-        try:
-            self.beforeSetUp()
-            self.app = self._app()
-            self.portal = self._portal()
-            self._setup()
-            self.afterSetUp()
-        except:
-            self.beforeClear()
-            self._clear()
-            raise
+    setUp = PortalTestCase.setUp
+    tearDown = PortalTestCase.tearDown
 
     def _app(self):
         '''Returns the app object for a test.'''
         return self.getPortal().aq_parent
 
-    def beforeClear(self):
-      '''Called before _clear(). Subclasses should
-      use it to garbage collect objects which must not remain
-      in the system
-      '''
-      pass
-
-    def tearDown(self):
-      '''Tears down the fixture. Do not override,
-         use the hooks instead.
-      '''
-      PortalTestCase.tearDown(self)
-
 
 def runLiveTest(test_list, verbosity=1, stream=None, **kw):
   from Products.ERP5Type.tests.runUnitTest import DebugTestResult