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 centos 6 pip test

Browse source 
flake8 is having problems installing on python2.6, switching to different
module that still works easily on python 2.6
This commit is contained in:
Daniel Wallace 2018-01-17 22:41:06 -07:00
parent 40255194b0
commit 5455d2dee6
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/integration/modules/pip.py
View file

@ -47,7 +47,7 @@ class PipModuleTest(integration.ModuleCase):
'''
return any(w in ret for w in ['URLError', 'Download error'])
def pip_successful_install(self, target, expect=('flake8', 'pep8',)):
def pip_successful_install(self, target, expect=('tox', 'pep8',)):
'''
isolate regex for extracting `successful install` message from pip
'''
@ -102,7 +102,7 @@ class PipModuleTest(integration.ModuleCase):
with salt.utils.fopen(req1_filename, 'w') as f:
f.write('-r requirements1b.txt\n')
with salt.utils.fopen(req1b_filename, 'w') as f:
f.write('flake8\n')
f.write('tox\n')
with salt.utils.fopen(req2_filename, 'w') as f:
f.write('-r requirements2b.txt\n')
with salt.utils.fopen(req2b_filename, 'w') as f:
@ -140,7 +140,7 @@ class PipModuleTest(integration.ModuleCase):
with salt.utils.fopen(req1_filename, 'w') as f:
f.write('-r requirements1b.txt\n')
with salt.utils.fopen(req1b_filename, 'w') as f:
f.write('flake8\n')
f.write('tox\n')
with salt.utils.fopen(req2_filename, 'w') as f:
f.write('-r requirements2b.txt\n')
with salt.utils.fopen(req2b_filename, 'w') as f:
@ -173,7 +173,7 @@ class PipModuleTest(integration.ModuleCase):
req2_filename = os.path.join(self.venv_dir, 'requirements2.txt')
with salt.utils.fopen(req1_filename, 'w') as f:
f.write('flake8\n')
f.write('tox\n')
with salt.utils.fopen(req2_filename, 'w') as f:
f.write('pep8\n')
@ -210,7 +210,7 @@ class PipModuleTest(integration.ModuleCase):
req2_filepath = os.path.join(req_cwd, req2_filename)
with salt.utils.fopen(req1_filepath, 'w') as f:
f.write('flake8\n')
f.write('tox\n')
with salt.utils.fopen(req2_filepath, 'w') as f:
f.write('pep8\n')