[Checkins] SVN: Products.GenericSetup/trunk/ - removed broken run function and unittest.main calls

[Yvo Schubbe]

Log message for revision 115239:
  - removed broken run function and unittest.main calls

Changed:
  UU  Products.GenericSetup/trunk/Products/GenericSetup/MailHost/tests/test_exportimport.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/OFSP/tests/test_exportimport.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/PageTemplates/tests/test_exportimport.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/tests/test_exportimport.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/PythonScripts/tests/test_exportimport.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/ZCTextIndex/tests/test_exportimport.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/ZCatalog/tests/test_exportimport.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/testing.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/tests/test_content.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/tests/test_context.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/tests/test_differ.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/tests/test_profile_metadata.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/tests/test_registry.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/tests/test_rolemap.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/tests/test_stepzcml.py
  UU  Products.GenericSetup/trunk/Products/GenericSetup/tests/test_utils.py
  U   Products.GenericSetup/trunk/docs/CHANGES.rst

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/MailHost/tests/test_exportimport.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/MailHost/tests/test_exportimport.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/MailHost/tests/test_exportimport.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """MailHost export / import support unit tests.
-
-$Id$
 """
 
 import unittest
@@ -74,13 +72,8 @@
         self._BODY = _MAILHOST_BODY
 
 
-
 def test_suite():
     return unittest.TestSuite((
         unittest.makeSuite(MailHostXMLAdapterTests),
         unittest.makeSuite(MailHostXMLAdapterTestsWithNoneValue),
         ))
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/MailHost/tests/test_exportimport.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/OFSP/tests/test_exportimport.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/OFSP/tests/test_exportimport.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/OFSP/tests/test_exportimport.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """OFSP export / import support unit tests.
-
-$Id$
 """
 
 import unittest
@@ -56,7 +54,3 @@
     return unittest.TestSuite((
         unittest.makeSuite(FolderXMLAdapterTests),
         ))
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/OFSP/tests/test_exportimport.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/PageTemplates/tests/test_exportimport.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/PageTemplates/tests/test_exportimport.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/PageTemplates/tests/test_exportimport.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """PageTemplate export / import support unit tests.
-
-$Id$
 """
 
 import unittest
@@ -52,7 +50,3 @@
     return unittest.TestSuite((
         unittest.makeSuite(ZopePageTemplateBodyAdapterTests),
         ))
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/PageTemplates/tests/test_exportimport.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/tests/test_exportimport.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/tests/test_exportimport.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/tests/test_exportimport.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """PluginIndexes export / import support unit tests.
-
-$Id$
 """
 
 import unittest
@@ -208,7 +206,3 @@
         unittest.makeSuite(FilteredSetNodeAdapterTests),
         unittest.makeSuite(TopicIndexNodeAdapterTests),
         ))
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/tests/test_exportimport.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/PythonScripts/tests/test_exportimport.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/PythonScripts/tests/test_exportimport.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/PythonScripts/tests/test_exportimport.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """PythonScript export / import support unit tests.
-
-$Id$
 """
 
 import unittest
@@ -55,7 +53,3 @@
     return unittest.TestSuite((
         unittest.makeSuite(PythonScriptBodyAdapterTests),
         ))
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/PythonScripts/tests/test_exportimport.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/ZCTextIndex/tests/test_exportimport.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/ZCTextIndex/tests/test_exportimport.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/ZCTextIndex/tests/test_exportimport.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ZCTextIndex export / import support unit tests.
-
-$Id$
 """
 
 import unittest
@@ -106,7 +104,3 @@
         unittest.makeSuite(ZCLexiconNodeAdapterTests),
         unittest.makeSuite(ZCTextIndexNodeAdapterTests),
         ))
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/ZCTextIndex/tests/test_exportimport.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/ZCatalog/tests/test_exportimport.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/ZCatalog/tests/test_exportimport.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/ZCatalog/tests/test_exportimport.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ZCatalog export / import support unit tests.
-
-$Id$
 """
 
 import unittest
@@ -207,7 +205,3 @@
     return unittest.TestSuite((
         unittest.makeSuite(ZCatalogXMLAdapterTests),
         ))
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/ZCatalog/tests/test_exportimport.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/testing.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/testing.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/testing.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -12,6 +12,7 @@
 ##############################################################################
 """Node adapter testing utils.
 """
+
 from Testing.ZopeTestCase.layer import ZopeLite
 
 from xml.dom.minidom import parseString
@@ -20,7 +21,6 @@
 from zope.component import getMultiAdapter
 from zope.interface import implements
 from zope.interface.verify import verifyClass
-from zope.testing import testrunner
 from zope.testing.cleanup import cleanUp
 
 from Products.GenericSetup.interfaces import IBody
@@ -175,10 +175,3 @@
     @classmethod
     def tearDown(cls):
         cleanUp()
-
-
-def run(test_suite):
-    options = testrunner.get_options()
-    options.resume_layer = None
-    options.resume_number = 0
-    testrunner.run_with_options(options, test_suite)


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/testing.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """Component registry export / import support unit tests.
-
-$Id$
 """
 
 import unittest
@@ -460,7 +458,3 @@
 else:
     def test_suite():
         return unittest.TestSuite()
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_content.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_content.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_content.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """Filesystem exporter / importer adapter unit tests.
-
-$Id$
 """
 
 import unittest
@@ -959,6 +957,3 @@
     suite.addTest(unittest.makeSuite(INIAwareFileAdapterTests))
     suite.addTest(unittest.makeSuite(DAVAwareFileAdapterTests))
     return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_content.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_context.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_context.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_context.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ Unit tests for import / export contexts.
-
-$Id$
 """
 
 import unittest
@@ -1431,6 +1429,3 @@
         unittest.makeSuite( SnapshotExportContextTests ),
         unittest.makeSuite( SnapshotImportContextTests ),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_context.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_differ.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_differ.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_differ.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ Unit tests for differ module.
-
-$Id$
 """
 
 import unittest
@@ -397,6 +395,3 @@
         unittest.makeSuite(Test_unidiff),
         unittest.makeSuite(ConfigDiffTests),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_differ.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_profile_metadata.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_profile_metadata.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_profile_metadata.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ Unit tests for ProfileMetadata.
-
-$Id$
 """
 
 import unittest
@@ -88,7 +86,3 @@
     return unittest.TestSuite((
         unittest.makeSuite( ProfileMetadataTests ),
         ))
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_profile_metadata.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_registry.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_registry.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_registry.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ Registry unit tests.
-
-$Id$
 """
 
 import unittest
@@ -1146,7 +1144,3 @@
         unittest.makeSuite( ToolsetRegistryTests ),
         unittest.makeSuite( ProfileRegistryTests ),
         ))
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_registry.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_rolemap.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_rolemap.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_rolemap.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ GenericSetup rolemap export / import unit tests
-
-$Id$
 """
 
 import unittest
@@ -827,7 +825,3 @@
         unittest.makeSuite(Test_exportRolemap),
         unittest.makeSuite(Test_importRolemap),
         ))
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_rolemap.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_stepzcml.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_stepzcml.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_stepzcml.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """Unit tests for import/export step zcml module.
-
-$Id$
 """
 
 import unittest
@@ -71,7 +69,3 @@
     return unittest.TestSuite((
         unittest.makeSuite(ImportStepTests),
         ))
-
-if __name__ == '__main__':
-    from Products.GenericSetup.testing import run
-    run(test_suite())


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_stepzcml.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_utils.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_utils.py	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_utils.py	2010-07-30 16:03:55 UTC (rev 115239)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ GenericSetup.utils unit tests
-
-$Id$
 """
 
 import unittest
@@ -717,6 +715,3 @@
         unittest.makeSuite(ObjectManagerHelpersTests),
         unittest.makeSuite(PrettyDocumentTests),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_utils.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/docs/CHANGES.rst
===================================================================
--- Products.GenericSetup/trunk/docs/CHANGES.rst	2010-07-30 14:57:42 UTC (rev 115238)
+++ Products.GenericSetup/trunk/docs/CHANGES.rst	2010-07-30 16:03:55 UTC (rev 115239)
@@ -4,6 +4,9 @@
 1.6.2 (unreleased)
 ------------------
 
+- testing: Removed broken run function.
+  Unit test modules are no longer directly executable.
+
 - DateTime 2.12.5 does away with a special case representing 
   DateTime values for midnight (00:00:00) without their time and 
   time zone values. So DateTimes formerly rendered as