# HG changeset patch # User Matt Mackall # Date 1370208560 18000 # Node ID d402cca6f9b13444a03a560aec7a69bde8440914 # Parent 44c6de7459a75933930ffd26f0aca49ad6ea1895 run-tests: simplify env deletion [ original upstream message ] diff -r 44c6de7459a7 -r d402cca6f9b1 tests/run-tests.py --- a/tests/run-tests.py Sun Jun 02 16:22:51 2013 -0500 +++ b/tests/run-tests.py Sun Jun 02 16:29:20 2013 -0500 @@ -380,20 +380,15 @@ env['COLUMNS'] = '80' env['TERM'] = 'xterm' - env['CDPATH'] = '' - env['GREP_OPTIONS'] = '' - env['http_proxy'] = '' - env['no_proxy'] = '' - env['NO_PROXY'] = '' + for k in ('HG HGPROF CDPATH GREP_OPTIONS http_proxy no_proxy ' + + 'NO_PROXY').split(): + if k in env: + del env[k] # unset env related to hooks for k in env.keys(): if k.startswith('HG_'): del env[k] - if 'HG' in env: - del env['HG'] - if 'HGPROF' in env: - del env['HGPROF'] return env