diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-03-21 09:36:34 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-03-21 09:36:34 -0500 |
| commit | 7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce (patch) | |
| tree | 54d1dfc689ef0e4bc0d0c178c45e3fd55901d77a /testsuite/Testsrc/test_code_checks.py | |
| parent | 98ef06e6a0426958f476f2835839aea5de3f7bc6 (diff) | |
| parent | 5feb76d97c6b26228dcf521659f434c6b576310c (diff) | |
| download | bcfg2-7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce.tar.gz bcfg2-7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce.tar.bz2 bcfg2-7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce.zip | |
Merge branch 'maint'
Diffstat (limited to 'testsuite/Testsrc/test_code_checks.py')
| -rw-r--r-- | testsuite/Testsrc/test_code_checks.py | 12 |
1 files changed, 7 insertions, 5 deletions
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) |