# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1267999075 -3600
# Node ID 13b10c2621a5ae3b80b88e76c312812bead8e271
# Parent  13bb123ad8945a3653f67a3508f8c6c351edb0e3# Parent  8428f3bda904a6844548bcf976df56a138529a8a
Merge with stable

diff -r 13bb123ad894 -r 13b10c2621a5 tests/run-tests.py
--- a/tests/run-tests.py	Sun Mar 07 20:59:43 2010 +0100
+++ b/tests/run-tests.py	Sun Mar 07 22:57:55 2010 +0100
@@ -522,18 +522,11 @@
         hgrc.write('appendpid=True\n')
     hgrc.close()
 
-    err = os.path.join(TESTDIR, test+".err")
+    testpath = os.path.join(TESTDIR, test)
     ref = os.path.join(TESTDIR, test+".out")
-    testpath = os.path.join(TESTDIR, test)
-
+    err = os.path.join(TESTDIR, test+".err")
     if os.path.exists(err):
         os.remove(err)       # Remove any previous output files
-
-    # Make a tmp subdirectory to work in
-    tmpd = os.path.join(HGTMP, test)
-    os.mkdir(tmpd)
-    os.chdir(tmpd)
-
     try:
         tf = open(testpath)
         firstline = tf.readline().rstrip()
@@ -563,6 +556,11 @@
             return skip("not executable")
         cmd = '"%s"' % testpath
 
+    # Make a tmp subdirectory to work in
+    tmpd = os.path.join(HGTMP, test)
+    os.mkdir(tmpd)
+    os.chdir(tmpd)
+
     if options.timeout > 0:
         signal.alarm(options.timeout)
 
@@ -848,6 +846,7 @@
     os.environ["EMAIL"] = "Foo Bar <foo.bar@example.com>"
     os.environ['CDPATH'] = ''
     os.environ['COLUMNS'] = '80'
+    os.environ['http_proxy'] = ''
 
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
     TESTDIR = os.environ["TESTDIR"] = os.getcwd()