saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix python 3 path for shell test cases

Browse source
This commit is contained in:
Daniel A. Wozniak 2019-01-30 03:13:21 -07:00
parent a2bbf4dea8
commit 7bb4ceb620
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/support/case.py
View file

@ -246,6 +246,14 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin):
if salt.utils.is_windows():
cmd = 'python '
if 'cwd' not in popen_kwargs:
popen_kwargs['cwd'] = os.getcwd()
if 'env' not in popen_kwargs:
popen_kwargs['env'] = os.environ.copy()
if sys.version_info[0] < 3:
popen_kwargs['env'][b'PYTHONPATH'] = os.getcwd().encode()
else:
popen_kwargs['env']['PYTHONPATH'] = os.getcwd()
else:
cmd = 'PYTHONPATH='
python_path = os.environ.get('PYTHONPATH', None)