[Zope-Checkins] CVS: Zope3 - test.py:1.6

[Martijn Pieters]

Update of /cvs-repository/Zope3
In directory cvs.zope.org:/tmp/cvs-serv11966

Modified Files:
	test.py 
Log Message:
Fix all occurences of "def test_suite(): pass".

The test runner no longer tolerates empty returns from test_suite(), and the
PyUnit GUI testrunner now runs exactly the same number of tests as the
command line version (currently 1904).


=== Zope3/test.py 1.5 => 1.6 ===
     suites = []
     for file in files:
-        suites.append(module_from_path(file))
+        suites.append(module_from_path(file) + '.test_suite')
 
     suites = ", ".join(suites)
     minimal = (GUI == 'minimal')
@@ -271,10 +271,9 @@
     suite = unittest.TestSuite()
     for file in files:
         s = get_suite(file)
-        if s is not None:
-            if test_filter is not None:
-                s = filter_testcases(s, test_filter)
-            suite.addTest(s)
+        if test_filter is not None:
+            s = filter_testcases(s, test_filter)
+        suite.addTest(s)
     r = runner.run(suite)
 
 def remove_stale_bytecode(arg, dirname, names):