# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1271251402 -7200
# Node ID 1b9ed0c8a189e44e98762297b3b018c62f2d7877
# Parent  1c69e8924c9cb0fcfc7cfac2909bef796e79de08# Parent  f7050b041b5fc75101f44af9239f9d4d2561963e
Merge with stable

diff -r 1c69e8924c9c -r 1b9ed0c8a189 tests/run-tests.py
--- a/tests/run-tests.py	Tue Apr 13 10:28:48 2010 +0200
+++ b/tests/run-tests.py	Wed Apr 14 15:23:22 2010 +0200
@@ -46,9 +46,8 @@
 import errno
 import optparse
 import os
-import signal
+import shutil
 import subprocess
-import shutil
 import signal
 import sys
 import tempfile
@@ -664,6 +663,7 @@
 
     optcopy = dict(options.__dict__)
     optcopy['jobs'] = 1
+    del optcopy['blacklist']
     if optcopy['with_hg'] is None:
         optcopy['with_hg'] = os.path.join(BINDIR, "hg")
     optcopy.pop('anycoverage', None)
@@ -852,6 +852,11 @@
     os.environ['GREP_OPTIONS'] = ''
     os.environ['http_proxy'] = ''
 
+    # unset env related to hooks
+    for k in os.environ.keys():
+        if k.startswith('HG_'):
+            del os.environ[k]
+
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
     TESTDIR = os.environ["TESTDIR"] = os.getcwd()
     if options.tmpdir: