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

Merge pull request #47388 from dwoz/test_pip_fix

Browse source 
Fix missing import
This commit is contained in:
Daniel Wozniak 2018-04-28 11:33:14 -07:00 • committed by GitHub
commit a5367eaf63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/unit/modules/test_pip.py
View file

@ -10,6 +10,7 @@ from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
# Import salt libs
import salt.ext.six
import salt.utils
import salt.modules.pip as pip
from salt.exceptions import CommandExecutionError
@ -301,7 +302,7 @@ 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:
if salt.ext.six.PY2:
bin_path = bin_path.encode('string-escape')
else:
venv_path = '/test_env'