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 #37120 from rallytime/bp-36246

Browse source 
Back-port #36246 to 2016.3
This commit is contained in:
Nicole Thomas 2016-10-20 13:38:32 -06:00 • committed by GitHub
commit 2a35f57be8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/integration/states/pip.py
View file

@ -79,9 +79,12 @@ class PipStateTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
@requires_system_grains
def test_pip_installed_weird_install(self, grains=None):
# First, check to see if this is running on CentOS 5. If so, skip this test.
# First, check to see if this is running on CentOS 5 or MacOS.
# If so, skip this test.
if grains['os'] in ('CentOS',) and grains['osrelease_info'][0] in (5,):
self.skipTest('This test does not run reliably on CentOS 5')
if grains['os'] in ('MacOS',):
self.skipTest('This test does not run reliably on MacOS')
ographite = '/opt/graphite'
if os.path.isdir(ographite):
@ -365,7 +368,6 @@ class PipStateTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
# previously installed
ret = self.run_function(
'pip.install', ['pip==6.0'], upgrade=True,
ignore_installed=True,
bin_env=venv_dir
)
try:
@ -379,7 +381,7 @@ class PipStateTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
pprint.pprint(ret)
raise
# Le't make sure we have pip 6.0 installed
# Let's make sure we have pip 6.0 installed
self.assertEqual(
self.run_function('pip.list', ['pip'], bin_env=venv_dir),
{'pip': '6.0'}