fix undefined names

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16471 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Catalog/tests/testArchive.py

@@ -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 @@ class TestArchive(InventoryAPITestCase):
     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
 

product/ERP5Catalog/tests/testCatalogSecurity.py

@@ -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 @@ class Test(ERP5TypeTestCase):
     self.assertEquals(len(organisation_list),0)
 
 
-
-
-
-
-
-
-
-if __name__ == '__main__':
-    framework()
-else:
-    import unittest
-    def test_suite():
-        suite = unittest.TestSuite()
-        suite.addTest(unittest.makeSuite(Test))
-        return suite
+def test_suite():
+  suite = unittest.TestSuite()
+  suite.addTest(unittest.makeSuite(Test))
+  return suite
 

product/ERP5Catalog/tests/testERP5Catalog.py

@@ -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 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
                                    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