[CMF-checkins] CVS: CMF/CMFTopic/tests - test_all.py:1.7

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFTopic/tests
In directory cvs.zope.org:/tmp/cvs-serv32349/CMFTopic/tests

Modified Files:
	test_all.py 
Log Message:
- added optional 'suite_name' argument to build_test_suite()
- refactored all_cmf_tests and test_all to hide their test suites from other test runners
- added CMFActionIcons tests to all_cmf_tests
- removed pre Zope 2.6.4 compatibility code
- some whitespace, import and copyright cleanup


=== CMF/CMFTopic/tests/test_all.py 1.6 => 1.7 ===
--- CMF/CMFTopic/tests/test_all.py:1.6	Fri Jan  2 13:15:50 2004
+++ CMF/CMFTopic/tests/test_all.py	Mon Apr 26 04:55:22 2004
@@ -1,16 +1,29 @@
-from unittest import main
+##############################################################################
+#
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" CMFTopic tests.
+
+$Id$
+"""
 
+from unittest import main
 import Testing
 import Zope
-try:
-    Zope.startup()
-except AttributeError:
-    # for Zope versions before 2.6.1
-    pass
+Zope.startup()
 
 from Products.CMFCore.tests.base.utils import build_test_suite
 
-def test_suite():
+
+def suite():
     return build_test_suite('Products.CMFTopic.tests',[
         'test_DateC',
         'test_ListC',
@@ -20,5 +33,9 @@
         'test_Topic',
         ])
 
+def test_suite():
+    # Just to silence the top-level test.py
+    return None
+
 if __name__ == '__main__':
-    main(defaultTest='test_suite')
+    main(defaultTest='suite')