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

Point salt-call to correct multi-master configs

Browse source
This commit is contained in:
Daniel A. Wozniak 2019-09-04 19:55:19 +00:00
parent 2c281e0bea
commit e207de6408
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/multimaster/minion/test_event.py
View file

@ -4,7 +4,7 @@
from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing libs
from tests.support.case import MultimasterModuleCase, ShellTestCase
from tests.support.case import MultimasterModuleCase, MultiMasterTestShellCase
from tests.support.helpers import skip_if_not_root, destructiveTest
from tests.support.mixins import AdaptedConfigurationTestCaseMixin
from tests.support.unit import skipIf
@ -18,7 +18,7 @@ if isinstance(HAS_IPTABLES, tuple):
@destructiveTest
@skip_if_not_root
@skipIf(not HAS_IPTABLES, 'iptables command is not available')
class TestHandleEvents(MultimasterModuleCase, ShellTestCase, AdaptedConfigurationTestCaseMixin):
class TestHandleEvents(MultimasterModuleCase, MultiMasterTestShellCase, AdaptedConfigurationTestCaseMixin):
'''
Validate the events handling in multimaster environment
'''

10
tests/support/case.py
View file

@ -484,6 +484,16 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin):
pass
class MultiMasterTestShellCase(ShellTestCase):
'''
Execute a test for a shell command when running multi-master tests
'''
@property
def config_dir(self):
return RUNTIME_VARS.TMP_MM_CONF_DIR
class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixin):
'''
Execute a test for a shell command