[Zope-Checkins] SVN: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ Don't run testWebserver.py as part of the Zope2 test suite.

[Stefan H. Holek]

Log message for revision 69931:
  Don't run testWebserver.py as part of the Zope2 test suite.
  

Changed:
  U   Zope/branches/2.9/lib/python/Testing/ZopeTestCase/tests.py
  U   Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/tests.py

-=-
Modified: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/tests.py
===================================================================
--- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/tests.py	2006-09-02 14:40:19 UTC (rev 69930)
+++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/tests.py	2006-09-02 14:42:31 UTC (rev 69931)
@@ -1,19 +1,20 @@
-"""test runner that works with zope.testing.testrunner"""
+"""Test runner that works with zope.testing.testrunner"""
+
 import unittest
-import os, sys
+import os
+import Testing.ZopeTestCase
 
-import os, sys
-
 suite = unittest.TestSuite()
 
 names = os.listdir(os.path.dirname(__file__))
-tests = [x[:-3] for x in names \
-         if x.startswith('test') and x.endswith('.py') \
-         and not x == 'tests.py']
+tests = [x[:-3] for x in names
+         if x.startswith('test') and x.endswith('.py')
+         and x != 'tests.py'
+         # Don't run this module as part of the Zope2 suite
+         and x != 'testWebserver.py']
 
-import Testing.ZopeTestCase
 for test in tests:
-    m = __import__("Testing.ZopeTestCase.%s" %test)
+    m = __import__('Testing.ZopeTestCase.%s' % test)
     m = getattr(Testing.ZopeTestCase, test)
     if hasattr(m, 'test_suite'):
         suite.addTest(m.test_suite())

Modified: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/tests.py
===================================================================
--- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/tests.py	2006-09-02 14:40:19 UTC (rev 69930)
+++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/tests.py	2006-09-02 14:42:31 UTC (rev 69931)
@@ -1,19 +1,18 @@
-"""test runner that works with zope.testing.testrunner"""
+"""Test runner that works with zope.testing.testrunner"""
+
 import unittest
-import os, sys
+import os
+import Testing.ZopeTestCase.zopedoctest
 
-import os, sys
-
 suite = unittest.TestSuite()
 
 names = os.listdir(os.path.dirname(__file__))
-tests = [x[:-3] for x in names \
-         if x.startswith('test') and x.endswith('.py') \
-         and not x == 'tests.py']
+tests = [x[:-3] for x in names
+         if x.startswith('test') and x.endswith('.py')
+         and x != 'tests.py']
 
-import Testing.ZopeTestCase.zopedoctest
 for test in tests:
-    m = __import__("Testing.ZopeTestCase.zopedoctest.%s" %test)
+    m = __import__('Testing.ZopeTestCase.zopedoctest.%s' % test)
     m = getattr(Testing.ZopeTestCase.zopedoctest, test)
     if hasattr(m, 'test_suite'):
         suite.addTest(m.test_suite())