From a6126199c03919614f9f43afa57d4c19df06ffd6 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 19 Mar 2013 14:13:48 -0400 Subject: testsuite: fixed PYTHONPATH in pylint checks --- testsuite/Testsrc/test_code_checks.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'testsuite') diff --git a/testsuite/Testsrc/test_code_checks.py b/testsuite/Testsrc/test_code_checks.py index ded9cd8e3..3036397b6 100644 --- a/testsuite/Testsrc/test_code_checks.py +++ b/testsuite/Testsrc/test_code_checks.py @@ -159,12 +159,14 @@ class TestPylint(Bcfg2TestCase): blacklist def get_env(self): - env = copy.copy(os.environ) - if 'PYTHONPATH' in os.environ: - env['PYTHONPATH'] = '%s:%s' % (env['PYTHONPATH'], testdir) + if ('PYTHONPATH' not in os.environ or + testdir not in os.environ['PYTHONPATH'].split(":")): + env = copy.copy(os.environ) + env['PYTHONPATH'] = ':'.join([env.get("PYTHONPATH", ""), + testdir]) + return env else: - env['PYTHONPATH'] = testdir - return env + return os.environ @skipIf(not os.path.exists(srcpath), "%s does not exist" % srcpath) @skipIf(not os.path.exists(rcfile), "%s does not exist" % rcfile) -- cgit v1.2.3-1-g7c22