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

Skip weird_install test on Mac OS X

Browse source
This commit is contained in:
twangboy 2016-09-13 11:35:38 -06:00 • committed by rallytime
parent 90de794290
commit f1c8d98119
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/virtualenv_mod.py
View file

@ -11,7 +11,6 @@ import glob
import shutil
import logging
import os
import sys
# Import salt libs
import salt.utils
@ -133,9 +132,6 @@ def create(path,
# raise CommandNotFoundError if venv_bin is missing
salt.utils.check_or_die(venv_bin)
if not os.path.exists(venv_bin):
venv_bin = '/'.join([os.path.dirname(sys.executable), venv_bin])
cmd = [venv_bin]
if 'pyvenv' not in venv_bin:

5
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):