valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make transport unit tests pull configs from test suite instead of from /etc/salt

Browse Source
This commit is contained in:
Thomas Jackson 2015-04-02 09:14:43 -07:00
parent d626d83c7d
commit d87c62b453
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/transport/zeromq.py
View File

@ -528,6 +528,15 @@ class AsyncReqMessageClient(object):
self.send_timeout_map = {} # message -> timeout
def destroy(self):
if hasattr(self, 'stream'):
self.stream.close()
self.socket.close()
self.context.term()
def __del__(self):
self.destroy()
def _init_socket(self):
if hasattr(self, 'stream'):
self.stream.close()

15
tests/unit/transport/tcp_test.py
View File

@ -23,6 +23,7 @@ from salttesting import TestCase
from salttesting.runtests import RUNTIME_VARS
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../')
import integration
# Import Salt libs
from salt import client
@ -33,7 +34,7 @@ from unit.transport.pub_test import PubChannelMixin
# TODO: move to a library?
def get_config_file_path(filename):
return os.path.join(RUNTIME_VARS.TMP_CONF_DIR, filename)
return os.path.join(integration.TMP, 'config', filename)
class BaseTCPReqCase(TestCase):
'''
@ -48,8 +49,10 @@ class BaseTCPReqCase(TestCase):
})
cls.minion_opts = salt.config.minion_config(get_config_file_path('minion'))
cls.minion_opts.update(salt.config.client_config(get_config_file_path('minion')))
cls.minion_opts['transport'] = 'tcp'
cls.minion_opts.update({
'transport': 'tcp',
'master_uri': 'tcp://127.0.0.1:{0}'.format(cls.minion_opts['master_port']),
})
cls.process_manager = salt.utils.process.ProcessManager(name='ReqServer_ProcessManager')
@ -76,7 +79,7 @@ class ClearReqTestCases(BaseTCPReqCase, ReqChannelMixin):
Test all of the clear msg stuff
'''
def setUp(self):
self.channel = channel = salt.transport.client.ReqChannel.factory(self.minion_opts, crypt='clear')
self.channel = salt.transport.client.ReqChannel.factory(self.minion_opts, crypt='clear')
@classmethod
@tornado.gen.coroutine
@ -89,7 +92,7 @@ class ClearReqTestCases(BaseTCPReqCase, ReqChannelMixin):
class AESReqTestCases(BaseTCPReqCase, ReqChannelMixin):
def setUp(self):
self.channel = channel = salt.transport.client.ReqChannel.factory(self.minion_opts)
self.channel = salt.transport.client.ReqChannel.factory(self.minion_opts)
@classmethod
@tornado.gen.coroutine
@ -124,11 +127,11 @@ class BaseTCPPubCase(AsyncTestCase):
})
cls.minion_opts = salt.config.minion_config(get_config_file_path('minion'))
cls.minion_opts.update(salt.config.client_config(get_config_file_path('minion')))
cls.minion_opts.update({
'transport': 'tcp',
'master_ip': '127.0.0.1',
'auth_timeout': 1,
'master_uri': 'tcp://127.0.0.1:{0}'.format(cls.minion_opts['master_port']),
})
cls.process_manager = salt.utils.process.ProcessManager(name='ReqServer_ProcessManager')

14
tests/unit/transport/zeromq_test.py
View File

@ -25,6 +25,8 @@ from salttesting.runtests import RUNTIME_VARS
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../')
import integration
# Import Salt libs
from salt import client
from salt.exceptions import EauthAuthenticationError, SaltInvocationError
@ -34,7 +36,7 @@ from unit.transport.pub_test import PubChannelMixin
# TODO: move to a library?
def get_config_file_path(filename):
return os.path.join(RUNTIME_VARS.TMP_CONF_DIR, filename)
return os.path.join(integration.TMP, 'config', filename)
class BaseZMQReqCase(TestCase):
'''
@ -49,11 +51,11 @@ class BaseZMQReqCase(TestCase):
})
cls.minion_opts = salt.config.minion_config(get_config_file_path('minion'))
cls.minion_opts.update(salt.config.client_config(get_config_file_path('minion')))
cls.minion_opts.update({
'transport': 'zeromq',
'auth_timeout': 5,
'auth_tries': 1,
'master_uri': 'tcp://127.0.0.1:{0}'.format(cls.minion_opts['master_port']),
})
cls.process_manager = salt.utils.process.ProcessManager(name='ReqServer_ProcessManager')
@ -80,7 +82,7 @@ class ClearReqTestCases(BaseZMQReqCase, ReqChannelMixin):
Test all of the clear msg stuff
'''
def setUp(self):
self.channel = channel = salt.transport.client.ReqChannel.factory(self.minion_opts, crypt='clear')
self.channel = salt.transport.client.ReqChannel.factory(self.minion_opts, crypt='clear')
@classmethod
@tornado.gen.coroutine
@ -93,7 +95,7 @@ class ClearReqTestCases(BaseZMQReqCase, ReqChannelMixin):
class AESReqTestCases(BaseZMQReqCase, ReqChannelMixin):
def setUp(self):
self.channel = channel = salt.transport.client.ReqChannel.factory(self.minion_opts)
self.channel = salt.transport.client.ReqChannel.factory(self.minion_opts)
@classmethod
@tornado.gen.coroutine
@ -112,7 +114,7 @@ class AESReqTestCases(BaseZMQReqCase, ReqChannelMixin):
msgs = ['', [], tuple()]
for msg in msgs:
with self.assertRaises(salt.exceptions.AuthenticationError):
ret = self.channel.send(msg)
ret = self.channel.send(msg, timeout=1)
class BaseZMQPubCase(AsyncTestCase):
@ -128,10 +130,10 @@ class BaseZMQPubCase(AsyncTestCase):
})
cls.minion_opts = salt.config.minion_config(get_config_file_path('minion'))
cls.minion_opts.update(salt.config.client_config(get_config_file_path('minion')))
cls.minion_opts.update({
'transport': 'zeromq',
'master_ip': '127.0.0.1',
'master_uri': 'tcp://127.0.0.1:{0}'.format(cls.minion_opts['master_port']),
})
cls.process_manager = salt.utils.process.ProcessManager(name='ReqServer_ProcessManager')