diff tests/run-tests.py @ 10155:df7fc77533fb

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 29 Dec 2009 16:16:25 -0600
parents ec8304e66ea5 d4a62b6d4a58
children 542279f81203
line wrap: on
line diff
--- a/tests/run-tests.py	Mon Dec 28 16:48:57 2009 +0100
+++ b/tests/run-tests.py	Tue Dec 29 16:16:25 2009 -0600
@@ -820,6 +820,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()