[Zope3-checkins] SVN: Zope3/trunk/src/zope/testing/test.py Don't process ftesting.zcml if no functional tests were found.

[Jim Fulton]

Log message for revision 24878:
Don't process ftesting.zcml if no functional tests were found.



-=-
Modified: Zope3/trunk/src/zope/testing/test.py
===================================================================
--- Zope3/trunk/src/zope/testing/test.py	2004-05-22 09:18:57 UTC (rev 24877)
+++ Zope3/trunk/src/zope/testing/test.py	2004-05-22 09:39:06 UTC (rev 24878)
@@ -488,16 +488,6 @@
             sys.path.insert(0, extra)
         else:
             print "Running %s tests from %s" % (kind, self.cwd)
-        # Make sure functional tests find ftesting.zcml
-        if functional:
-            config_file = FTESTING
-            if not self.inplace:
-                # We chdired into build, so ftesting.zcml is in the
-                # parent directory
-                config_file = os.path.join('..', FTESTING)
-            print "Parsing %s" % config_file
-            from zope.app.tests.functional import FunctionalTestSetup
-            FunctionalTestSetup(config_file)
 
 def match(rx, s):
     if not rx:
@@ -766,6 +756,18 @@
     files = find_tests(module_filter)
     files.sort()
 
+    # Make sure functional tests find ftesting.zcml
+    if files and functional:
+        config_file = FTESTING
+        if not pathinit.inplace:
+            # We chdired into build, so ftesting.zcml is in the
+            # parent directory
+            config_file = os.path.join('..', FTESTING)
+        print "Parsing %s" % config_file
+        from zope.app.tests.functional import FunctionalTestSetup
+        FunctionalTestSetup(config_file)
+    
+
     if GUI:
         gui_runner(files, test_filter)
     elif LOOP: