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

Merge pull request #45522 from rallytime/merge-2016.11

Browse Source 
[2016.11] Merge forward from 2016.11.9 to 2016.11
This commit is contained in:
Nicole Thomas 2018-01-18 10:22:54 -05:00 committed by GitHub
commit 4f3b9b57fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 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')

4
tests/integration/modules/pkg.py
View File

@ -240,10 +240,10 @@ class PkgModuleTest(integration.ModuleCase,
self.assertIn('bash-completion', keys)
self.assertIn('dpkg', keys)
elif os_family == 'RedHat':
ret = self.run_function(func, ['rpm', 'yum'])
ret = self.run_function(func, ['rpm', 'bash'])
keys = ret.keys()
self.assertIn('rpm', keys)
self.assertIn('yum', keys)
self.assertIn('bash', keys)
elif os_family == 'SUSE':
ret = self.run_function(func, ['less', 'zypper'])
keys = ret.keys()