fix undefined names

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

product/ERP5OOo/tests/testIngestion.py

@@ -28,7 +28,8 @@
 #
 ##############################################################################
 
-import os, sys, cStringIO, zipfile
+import unittest
+import os, cStringIO, zipfile
 from xml.dom.minidom import parseString
 from Testing import ZopeTestCase
 from DateTime import DateTime
@@ -40,13 +41,6 @@ from Products.ERP5OOo.Document.OOoDocument import ConversionError
 from Products.ERP5.Document.File import _unpackData
 from zLOG import LOG, INFO, ERROR
 
-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'
-
 # Define the conversion server host
 conversion_server_host = ('127.0.0.1', 8008)
 
@@ -1183,17 +1177,14 @@ class TestIngestion(ERP5TypeTestCase):
                 ]
     self.playSequence(step_list, quiet)
 
-if __name__ == '__main__':
-  framework()
-else:
-  import unittest
-  def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestIngestion))
-    return suite
 
 # Missing tests
 """
     property_dict = context.getPropertyDictFromUserLogin()
     property_dict = context.getPropertyDictFromInput()
 """
+
+def test_suite():
+  suite = unittest.TestSuite()
+  suite.addTest(unittest.makeSuite(TestIngestion))
+  return suite

product/ERP5OOo/tests/test_document/TEST-en-002.py

@@ -45,12 +45,6 @@ from Products.ERP5Type.Cache import clearCache
 from Products.ERP5OOo.Document.OOoDocument import ConversionError
 
 
-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'
 
 ooodoc_coordinates = ('127.0.0.1', 8008)
 
@@ -793,11 +787,8 @@ class TestIngestion(ERP5TypeTestCase):
     """
 
 
-if __name__ == '__main__':
-  framework()
-else:
-  import unittest
-  def test_suite():
+import unittest
+def test_suite():
   suite = unittest.TestSuite()
   suite.addTest(unittest.makeSuite(TestIngestion))
   return suite