mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
Merge pull request #19536 from rallytime/pip_test_fix
Don't run weird pip install test on CentOS 5
This commit is contained in:
commit
ca9a871d43
@ -64,6 +64,16 @@ class PipStateTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
|
||||
shutil.rmtree(venv_dir)
|
||||
|
||||
def test_pip_installed_weird_install(self):
|
||||
# First, check to see if this is running on CentOS 5
|
||||
os_grain = self.run_function('grains.item', ['os'])
|
||||
os_version = self.run_function('grains.item', ['osmajorrelease'])
|
||||
|
||||
# Skip this test if running on CentOS 5
|
||||
if os_grain['os'] == 'CentOS' and os_version['osmajorrelease'] == 5:
|
||||
self.skipTest(
|
||||
'This test does not run reliably on CentOS 5'
|
||||
)
|
||||
|
||||
ographite = '/opt/graphite'
|
||||
if os.path.isdir(ographite):
|
||||
self.skipTest(
|
||||
|
Loading…
Reference in New Issue
Block a user