[Zope3-checkins] SVN: zope.testing/trunk/src/zope/testing/testrunner.py Changed the strategy for setting the path when the test runner is run

[Jim Fulton]

Log message for revision 30975:
  Changed the strategy for setting the path when the test runner is run
  as a subprocess, which should only happen when it's own tests are run.
  

Changed:
  U   zope.testing/trunk/src/zope/testing/testrunner.py

-=-
Modified: zope.testing/trunk/src/zope/testing/testrunner.py
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner.py	2005-07-01 18:55:42 UTC (rev 30974)
+++ zope.testing/trunk/src/zope/testing/testrunner.py	2005-07-01 19:19:06 UTC (rev 30975)
@@ -270,7 +270,13 @@
     subin, subout, suberr = os.popen3(args)
     for l in subout:
         sys.stdout.write(l)
-    ran, nfail, nerr = map(int, suberr.readline().strip().split())
+
+    line = suberr.readline()
+    try:
+        ran, nfail, nerr = map(int, line.strip().split())
+    except:
+        raise SubprocessError(line+suberr.read())
+        
     while nfail > 0:
         nfail -= 1
         failures.append((suberr.readline().strip(), None))
@@ -280,6 +286,10 @@
     return ran
         
 
+class SubprocessError(Exception):
+    """An error occurred when running a subprocess
+    """
+
 class CanNotTearDown(Exception):
     "Couldn't tear down a test"
 
@@ -302,8 +312,6 @@
             print "in %.3f seconds." % (time.time() - t)
         del setup_layers[l]
 
-
-
 def setup_layer(layer, setup_layers):
     if layer not in setup_layers:
         for base in layer.__bases__:
@@ -1140,13 +1148,11 @@
     run(default)
 
 if __name__ == '__main__':
-    # Hm, when run as a script, we need to import the testrunner under
-    # it's own name, so that there's the imported flavor has the right
-    # real_pdb_set_trace.  We also want to make sure we can import it.
-    # If we can't, we should try fixing the path and trying again
-    try:
-        import zope.testing.testrunner
-    except ImportError:
+
+    # if --resume_layer is in the arguments, we are being run from the
+    # test runner's own tests.  We need to adjust the path in hopes of
+    # not getting a different version installed in the system python.
+    if sys.argv[1] == '--resume-layer':
         sys.path.insert(0, 
             os.path.split(
                 os.path.split(
@@ -1155,10 +1161,12 @@
                         )[0]
                     )[0]
                 )[0]
-            ) # put at beginning to avoid one in site_packages
-        import zope.testing.testrunner
+            )
 
-
+    # Hm, when run as a script, we need to import the testrunner under
+    # it's own name, so that there's the imported flavor has the right
+    # real_pdb_set_trace.
+    import zope.testing.testrunner
     from zope.testing import doctest
     main()