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

Moving the skipIf for OS X from the beacon state tests to the renderer state tests.

Browse source
This commit is contained in:
Gareth J. Greenaway 2019-06-14 20:32:52 -07:00
parent d2fef9ac3f
commit b10e1e7c58
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/integration/states/test_beacon.py
View file

@ -14,7 +14,6 @@ import logging
log = logging.getLogger(__name__)
@skipIf(salt.utils.platform.is_darwin(), 'minion is OS X, skipping for now')
class BeaconStateTestCase(ModuleCase, SaltReturnAssertsMixin):
'''
Test beacon states

7
tests/integration/states/test_renderers.py
View file

@ -8,7 +8,11 @@ from __future__ import absolute_import, unicode_literals, print_function
# Import Salt Testing libs
from tests.support.case import ModuleCase
from tests.support.helpers import flaky
from tests.support.helpers import flaky, skipIf
from tests.support.unit import skipIf
# Import Salt libs
import salt.utils.platform
class TestJinjaRenderer(ModuleCase):
@ -24,6 +28,7 @@ class TestJinjaRenderer(ModuleCase):
self.assertTrue(state_ret['result'])
@flaky
@skipIf(salt.utils.platform.is_darwin(), 'minion is OS X, skipping for now')
def test_salt_contains_function(self):
'''
Test if we are able to check if a function exists inside the "salt"