valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #47384 from dwoz/test_pip_fix

Browse Source 
Fix py2 version of pip test
This commit is contained in:
Daniel Wallace 2018-04-28 10:13:28 -05:00 committed by GitHub
commit 37822c0cbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit/modules/test_pip.py
View File

@ -301,6 +301,8 @@ class PipTestCase(TestCase, LoaderModuleMockMixin):
if salt.utils.is_windows():
venv_path = 'c:\\test_env'
bin_path = os.path.join(venv_path, 'Scripts', 'pip.exe')
if six.PY2:
bin_path = bin_path.encode('string-escape')
else:
venv_path = '/test_env'
bin_path = os.path.join(venv_path, 'bin', 'pip')