From 268c051ebaa2b23140552a227c812d0854448eeb Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 19 Dec 2011 12:02:07 -0500 Subject: [PATCH] propogate current PYTHONPATH --- testing/acceptance_test.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index cc678f8c6..27d086f12 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -410,15 +410,20 @@ class TestInvocationVariants: "*1 passed*" ]) + def join_pythonpath(what): + cur = py.std.os.environ.get('PYTHONPATH') + if cur: + return str(what) + ':' + cur + return what empty_package = testdir.mkpydir("empty_package") - monkeypatch.setenv('PYTHONPATH', empty_package) + monkeypatch.setenv('PYTHONPATH', join_pythonpath(empty_package)) result = testdir.runpytest("--pyargs", ".") assert result.ret == 0 result.stdout.fnmatch_lines([ "*2 passed*" ]) - monkeypatch.setenv('PYTHONPATH', testdir) + monkeypatch.setenv('PYTHONPATH', join_pythonpath(testdir)) path.join('test_hello.py').remove() result = testdir.runpytest("--pyargs", "tpkg.test_hello") assert result.ret != 0