mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
fix masterapi test to use testing directory for configs
This commit is contained in:
parent
5a41f484ef
commit
556a2067fc
@ -2,12 +2,14 @@
|
|||||||
|
|
||||||
# Import Python libs
|
# Import Python libs
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
import os
|
||||||
|
|
||||||
# Import Salt libs
|
# Import Salt libs
|
||||||
import salt.config
|
import salt.config
|
||||||
import salt.daemons.masterapi as masterapi
|
import salt.daemons.masterapi as masterapi
|
||||||
|
|
||||||
# Import Salt Testing Libs
|
# Import Salt Testing Libs
|
||||||
|
from tests.support.paths import TMP_CONF_DIR
|
||||||
from tests.support.unit import TestCase
|
from tests.support.unit import TestCase
|
||||||
from tests.support.mock import (
|
from tests.support.mock import (
|
||||||
patch,
|
patch,
|
||||||
@ -33,7 +35,7 @@ class RemoteFuncsTestCase(TestCase):
|
|||||||
'''
|
'''
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
opts = salt.config.master_config(None)
|
opts = salt.config.master_config(os.path.join(TMP_CONF_DIR, 'master'))
|
||||||
self.funcs = masterapi.RemoteFuncs(opts)
|
self.funcs = masterapi.RemoteFuncs(opts)
|
||||||
self.funcs.cache = FakeCache()
|
self.funcs.cache = FakeCache()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user