valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the test suite __opts__ instead of custom dict

Browse Source 
Better approach now that we're in Salt core.
This commit is contained in:
Seth House 2014-07-14 17:09:25 -06:00
parent 1577bf0fad
commit c25e658420
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/utils/__init__.py
View File

@ -7,6 +7,10 @@ except ImportError:
HAS_CHERRYPY = False
import mock
import os
import salt.config
from ..integration import TMP_CONF_DIR
if HAS_CHERRYPY:
from . cptestcase import BaseCherryPyTestCase
@ -31,6 +35,12 @@ class BaseRestCherryPyTest(BaseCherryPyTestCase):
'''
__opts__ = None
def __init__(self, *args, **kwargs):
super(BaseRestCherryPyTest, self).__init__(*args, **kwargs)
master_conf = os.path.join(TMP_CONF_DIR, 'master')
self.config = salt.config.client_config(master_conf)
@mock.patch('salt.netapi.NetapiClient', autospec=True)
@mock.patch('salt.auth.Resolver', autospec=True)
@mock.patch('salt.auth.LoadAuth', autospec=True)
@ -47,7 +57,8 @@ class BaseRestCherryPyTest(BaseCherryPyTestCase):
self.NetapiClient = NetapiClient
self.get_event = get_event
__opts__ = self.__opts__ or {
__opts__ = self.config.copy()
__opts__.update(self.__opts__ or {
'external_auth': {
'auto': {
'saltdev': [
@ -61,7 +72,7 @@ class BaseRestCherryPyTest(BaseCherryPyTestCase):
'port': 8000,
'debug': True,
},
}
})
root, apiopts, conf = app.get_app(__opts__)