[Erp5-report] r16471 - /erp5/trunk/products/ERP5Catalog/tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 19 14:20:47 CEST 2007
Author: jerome
Date: Wed Sep 19 14:20:46 2007
New Revision: 16471
URL: http://svn.erp5.org?rev=16471&view=rev
Log:
fix undefined names
Modified:
erp5/trunk/products/ERP5Catalog/tests/testArchive.py
erp5/trunk/products/ERP5Catalog/tests/testCatalogSecurity.py
erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py
Modified: erp5/trunk/products/ERP5Catalog/tests/testArchive.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/tests/testArchive.py?rev=16471&r1=16470&r2=16471&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/tests/testArchive.py (original)
+++ erp5/trunk/products/ERP5Catalog/tests/testArchive.py Wed Sep 19 14:20:46 2007
@@ -26,13 +26,7 @@
#
##############################################################################
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
+import unittest
from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
@@ -301,12 +295,8 @@
self.assertEquals(100, getInventory(node=self.node.getRelativeUrl()))
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestArchive))
- return suite
-
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestArchive))
+ return suite
+
Modified: erp5/trunk/products/ERP5Catalog/tests/testCatalogSecurity.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/tests/testCatalogSecurity.py?rev=16471&r1=16470&r2=16471&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/tests/testCatalogSecurity.py (original)
+++ erp5/trunk/products/ERP5Catalog/tests/testCatalogSecurity.py Wed Sep 19 14:20:46 2007
@@ -27,32 +27,11 @@
##############################################################################
-
-#
-# Skeleton ZopeTestCase
-#
-
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
+import unittest
from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager
-from DateTime import DateTime
-from Acquisition import aq_base, aq_inner
+from AccessControl.SecurityManagement import newSecurityManager
from zLOG import LOG
-from Products.ERP5Type.DateUtils import addToDate
-import time
-import os
-from Products.ERP5Type import product_path
-from DateTime import DateTime
class Test(ERP5TypeTestCase):
"""
@@ -165,19 +144,8 @@
self.assertEquals(len(organisation_list),0)
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(Test))
+ return suite
-
-
-
-
-
-
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(Test))
- return suite
-
Modified: erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py?rev=16471&r1=16470&r2=16471&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py (original)
+++ erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py Wed Sep 19 14:20:46 2007
@@ -26,13 +26,8 @@
#
##############################################################################
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
+import unittest
+import sys
from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
@@ -1820,12 +1815,9 @@
ctool(title='The Document',
owner='somebody else')])
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestERP5Catalog))
- return suite
-
+
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestERP5Catalog))
+ return suite
+
More information about the Erp5-report
mailing list