[Zope3-checkins] SVN: zope.testing/trunk/ Work around some windows issues.

[Jim Fulton]

Log message for revision 30972:
  Work around some windows issues.
  

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

-=-
Modified: zope.testing/trunk/src/zope/testing/testrunner.py
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner.py	2005-07-01 17:23:12 UTC (rev 30971)
+++ zope.testing/trunk/src/zope/testing/testrunner.py	2005-07-01 17:41:38 UTC (rev 30972)
@@ -262,9 +262,9 @@
     args.extend(options.original_testrunner_args[1:])
 
     if sys.platform.startswith('win'):
-        args = ' '.join([
+        args = args[0] + ' ' + ' '.join([
             ('"' + a.replace('\\', '\\\\').replace('"', '\\"') + '"')
-            for a in args
+            for a in args[1:]
             ])
 
     subin, subout, suberr = os.popen3(args)
@@ -1147,7 +1147,7 @@
     try:
         import zope.testing.testrunner
     except ImportError:
-        sys.path.append(
+        sys.path.insert(0, 
             os.path.split(
                 os.path.split(
                     os.path.split(
@@ -1155,7 +1155,7 @@
                         )[0]
                     )[0]
                 )[0]
-            )
+            ) # put at beginning to avoid one in site_packages
         import zope.testing.testrunner
 
 

Modified: zope.testing/trunk/test.py
===================================================================
--- zope.testing/trunk/test.py	2005-07-01 17:23:12 UTC (rev 30971)
+++ zope.testing/trunk/test.py	2005-07-01 17:41:38 UTC (rev 30972)
@@ -22,7 +22,7 @@
 import os, sys
 
 src = os.path.join(os.path.split(sys.argv[0])[0], 'src')
-sys.path.append(src)
+sys.path.insert(0, src) # put at beginning to avoid one in site_packages
 
 from zope.testing import testrunner