mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
3273bbdab7
Conflicts: - doc/ref/configuration/master.rst - doc/ref/modules/all/index.rst - doc/topics/grains/index.rst - doc/topics/releases/2016.3.4.rst - doc/topics/spm/spm_formula.rst - doc/topics/tutorials/cron.rst - doc/topics/tutorials/index.rst - doc/topics/tutorials/stormpath.rst - salt/engines/slack.py - salt/log/handlers/fluent_mod.py - salt/modules/cyg.py - salt/modules/junos.py - salt/modules/namecheap_dns.py - salt/modules/namecheap_domains.py - salt/modules/namecheap_ns.py - salt/modules/namecheap_ssl.py - salt/modules/namecheap_users.py - salt/modules/reg.py - salt/modules/tomcat.py - salt/modules/vault.py - salt/modules/win_file.py - salt/modules/zpool.py - salt/output/highstate.py - salt/renderers/pass.py - salt/runners/cache.py - salt/states/boto_apigateway.py - salt/states/boto_iam.py - salt/states/boto_route53.py - salt/states/msteams.py - salt/states/reg.py - salt/states/win_iis.py - tests/integration/modules/test_cmdmod.py - tests/integration/states/test_user.py - tests/support/helpers.py - tests/unit/cloud/clouds/test_openstack.py - tests/unit/fileserver/test_gitfs.py - tests/unit/modules/test_junos.py - tests/unit/pillar/test_git.py - tests/unit/states/test_win_path.py - tests/unit/test_pillar.py - tests/unit/utils/test_format_call.py - tests/unit/utils/test_utils.py - tests/unit/utils/test_warnings.py
313 lines
11 KiB
Python
313 lines
11 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: Thomas Jackson <jacksontj.89@gmail.com>
|
|
'''
|
|
|
|
# Import python libs
|
|
from __future__ import absolute_import, print_function, unicode_literals
|
|
import threading
|
|
|
|
import tornado.gen
|
|
import tornado.ioloop
|
|
import tornado.concurrent
|
|
from tornado.testing import AsyncTestCase, gen_test
|
|
|
|
import salt.config
|
|
from salt.ext import six
|
|
import salt.utils.platform
|
|
import salt.utils.process
|
|
import salt.transport.server
|
|
import salt.transport.client
|
|
import salt.exceptions
|
|
from salt.ext.six.moves import range
|
|
from salt.transport.tcp import SaltMessageClientPool
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.unit import TestCase, skipIf
|
|
from tests.support.helpers import get_unused_localhost_port, flaky
|
|
from tests.support.mixins import AdaptedConfigurationTestCaseMixin
|
|
from tests.support.mock import MagicMock, patch
|
|
from tests.unit.transport.mixins import PubChannelMixin, ReqChannelMixin
|
|
|
|
|
|
class BaseTCPReqCase(TestCase, AdaptedConfigurationTestCaseMixin):
|
|
'''
|
|
Test the req server/client pair
|
|
'''
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
if not hasattr(cls, '_handle_payload'):
|
|
return
|
|
ret_port = get_unused_localhost_port()
|
|
publish_port = get_unused_localhost_port()
|
|
tcp_master_pub_port = get_unused_localhost_port()
|
|
tcp_master_pull_port = get_unused_localhost_port()
|
|
tcp_master_publish_pull = get_unused_localhost_port()
|
|
tcp_master_workers = get_unused_localhost_port()
|
|
cls.master_config = cls.get_temp_config(
|
|
'master',
|
|
**{'transport': 'tcp',
|
|
'auto_accept': True,
|
|
'ret_port': ret_port,
|
|
'publish_port': publish_port,
|
|
'tcp_master_pub_port': tcp_master_pub_port,
|
|
'tcp_master_pull_port': tcp_master_pull_port,
|
|
'tcp_master_publish_pull': tcp_master_publish_pull,
|
|
'tcp_master_workers': tcp_master_workers}
|
|
)
|
|
|
|
cls.minion_config = cls.get_temp_config(
|
|
'minion',
|
|
**{'transport': 'tcp',
|
|
'master_ip': '127.0.0.1',
|
|
'master_port': ret_port,
|
|
'master_uri': 'tcp://127.0.0.1:{0}'.format(ret_port)}
|
|
)
|
|
|
|
cls.process_manager = salt.utils.process.ProcessManager(name='ReqServer_ProcessManager')
|
|
|
|
cls.server_channel = salt.transport.server.ReqServerChannel.factory(cls.master_config)
|
|
cls.server_channel.pre_fork(cls.process_manager)
|
|
|
|
cls.io_loop = tornado.ioloop.IOLoop()
|
|
|
|
def run_loop_in_thread(loop):
|
|
loop.make_current()
|
|
loop.start()
|
|
|
|
cls.server_channel.post_fork(cls._handle_payload, io_loop=cls.io_loop)
|
|
|
|
cls.server_thread = threading.Thread(target=run_loop_in_thread, args=(cls.io_loop,))
|
|
cls.server_thread.daemon = True
|
|
cls.server_thread.start()
|
|
|
|
@classmethod
|
|
def tearDownClass(cls):
|
|
if not hasattr(cls, '_handle_payload'):
|
|
return
|
|
if hasattr(cls, 'io_loop'):
|
|
cls.io_loop.add_callback(cls.io_loop.stop)
|
|
cls.server_thread.join()
|
|
cls.process_manager.kill_children()
|
|
cls.server_channel.close()
|
|
del cls.server_channel
|
|
|
|
@classmethod
|
|
@tornado.gen.coroutine
|
|
def _handle_payload(cls, payload):
|
|
'''
|
|
TODO: something besides echo
|
|
'''
|
|
raise tornado.gen.Return((payload, {'fun': 'send_clear'}))
|
|
|
|
|
|
@skipIf(salt.utils.platform.is_darwin(), 'hanging test suite on MacOS')
|
|
class ClearReqTestCases(BaseTCPReqCase, ReqChannelMixin):
|
|
'''
|
|
Test all of the clear msg stuff
|
|
'''
|
|
def setUp(self):
|
|
self.channel = salt.transport.client.ReqChannel.factory(self.minion_config, crypt='clear')
|
|
|
|
def tearDown(self):
|
|
del self.channel
|
|
|
|
@classmethod
|
|
@tornado.gen.coroutine
|
|
def _handle_payload(cls, payload):
|
|
'''
|
|
TODO: something besides echo
|
|
'''
|
|
raise tornado.gen.Return((payload, {'fun': 'send_clear'}))
|
|
|
|
|
|
@skipIf(salt.utils.platform.is_darwin(), 'hanging test suite on MacOS')
|
|
class AESReqTestCases(BaseTCPReqCase, ReqChannelMixin):
|
|
def setUp(self):
|
|
self.channel = salt.transport.client.ReqChannel.factory(self.minion_config)
|
|
|
|
def tearDown(self):
|
|
del self.channel
|
|
|
|
@classmethod
|
|
@tornado.gen.coroutine
|
|
def _handle_payload(cls, payload):
|
|
'''
|
|
TODO: something besides echo
|
|
'''
|
|
raise tornado.gen.Return((payload, {'fun': 'send'}))
|
|
|
|
# TODO: make failed returns have a specific framing so we can raise the same exception
|
|
# on encrypted channels
|
|
@flaky
|
|
def test_badload(self):
|
|
'''
|
|
Test a variety of bad requests, make sure that we get some sort of error
|
|
'''
|
|
msgs = ['', [], tuple()]
|
|
for msg in msgs:
|
|
with self.assertRaises(salt.exceptions.AuthenticationError):
|
|
ret = self.channel.send(msg)
|
|
|
|
|
|
class BaseTCPPubCase(AsyncTestCase, AdaptedConfigurationTestCaseMixin):
|
|
'''
|
|
Test the req server/client pair
|
|
'''
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
ret_port = get_unused_localhost_port()
|
|
publish_port = get_unused_localhost_port()
|
|
tcp_master_pub_port = get_unused_localhost_port()
|
|
tcp_master_pull_port = get_unused_localhost_port()
|
|
tcp_master_publish_pull = get_unused_localhost_port()
|
|
tcp_master_workers = get_unused_localhost_port()
|
|
cls.master_config = cls.get_temp_config(
|
|
'master',
|
|
**{'transport': 'tcp',
|
|
'auto_accept': True,
|
|
'ret_port': ret_port,
|
|
'publish_port': publish_port,
|
|
'tcp_master_pub_port': tcp_master_pub_port,
|
|
'tcp_master_pull_port': tcp_master_pull_port,
|
|
'tcp_master_publish_pull': tcp_master_publish_pull,
|
|
'tcp_master_workers': tcp_master_workers}
|
|
)
|
|
|
|
cls.minion_config = cls.get_temp_config(
|
|
'minion',
|
|
**{'transport': 'tcp',
|
|
'master_ip': '127.0.0.1',
|
|
'auth_timeout': 1,
|
|
'master_port': ret_port,
|
|
'master_uri': 'tcp://127.0.0.1:{0}'.format(ret_port)}
|
|
)
|
|
|
|
cls.process_manager = salt.utils.process.ProcessManager(name='ReqServer_ProcessManager')
|
|
|
|
cls.server_channel = salt.transport.server.PubServerChannel.factory(cls.master_config)
|
|
cls.server_channel.pre_fork(cls.process_manager)
|
|
|
|
# we also require req server for auth
|
|
cls.req_server_channel = salt.transport.server.ReqServerChannel.factory(cls.master_config)
|
|
cls.req_server_channel.pre_fork(cls.process_manager)
|
|
|
|
cls._server_io_loop = tornado.ioloop.IOLoop()
|
|
cls.req_server_channel.post_fork(cls._handle_payload, io_loop=cls._server_io_loop)
|
|
|
|
def run_loop_in_thread(loop):
|
|
loop.make_current()
|
|
loop.start()
|
|
|
|
cls.server_thread = threading.Thread(target=run_loop_in_thread, args=(cls._server_io_loop,))
|
|
cls.server_thread.daemon = True
|
|
cls.server_thread.start()
|
|
|
|
@classmethod
|
|
def _handle_payload(cls, payload):
|
|
'''
|
|
TODO: something besides echo
|
|
'''
|
|
return payload, {'fun': 'send_clear'}
|
|
|
|
@classmethod
|
|
def tearDownClass(cls):
|
|
cls._server_io_loop.add_callback(cls._server_io_loop.stop)
|
|
cls.server_thread.join()
|
|
cls.process_manager.kill_children()
|
|
cls.req_server_channel.close()
|
|
del cls.req_server_channel
|
|
|
|
def setUp(self):
|
|
super(BaseTCPPubCase, self).setUp()
|
|
self._start_handlers = dict(self.io_loop._handlers)
|
|
|
|
def tearDown(self):
|
|
super(BaseTCPPubCase, self).tearDown()
|
|
failures = []
|
|
for k, v in six.iteritems(self.io_loop._handlers):
|
|
if self._start_handlers.get(k) != v:
|
|
failures.append((k, v))
|
|
if len(failures) > 0:
|
|
raise Exception('FDs still attached to the IOLoop: {0}'.format(failures))
|
|
del self.channel
|
|
del self._start_handlers
|
|
|
|
|
|
@skipIf(True, 'Skip until we can devote time to fix this test')
|
|
class AsyncPubChannelTest(BaseTCPPubCase, PubChannelMixin):
|
|
'''
|
|
Tests around the publish system
|
|
'''
|
|
|
|
|
|
class SaltMessageClientPoolTest(AsyncTestCase):
|
|
def setUp(self):
|
|
super(SaltMessageClientPoolTest, self).setUp()
|
|
sock_pool_size = 5
|
|
with patch('salt.transport.tcp.SaltMessageClient.__init__', MagicMock(return_value=None)):
|
|
self.message_client_pool = SaltMessageClientPool({'sock_pool_size': sock_pool_size},
|
|
args=({}, '', 0))
|
|
self.original_message_clients = self.message_client_pool.message_clients
|
|
self.message_client_pool.message_clients = [MagicMock() for _ in range(sock_pool_size)]
|
|
|
|
def tearDown(self):
|
|
with patch('salt.transport.tcp.SaltMessageClient.close', MagicMock(return_value=None)):
|
|
del self.original_message_clients
|
|
super(SaltMessageClientPoolTest, self).tearDown()
|
|
|
|
def test_send(self):
|
|
for message_client_mock in self.message_client_pool.message_clients:
|
|
message_client_mock.send_queue = [0, 0, 0]
|
|
message_client_mock.send.return_value = []
|
|
self.assertEqual([], self.message_client_pool.send())
|
|
self.message_client_pool.message_clients[2].send_queue = [0]
|
|
self.message_client_pool.message_clients[2].send.return_value = [1]
|
|
self.assertEqual([1], self.message_client_pool.send())
|
|
|
|
def test_write_to_stream(self):
|
|
for message_client_mock in self.message_client_pool.message_clients:
|
|
message_client_mock.send_queue = [0, 0, 0]
|
|
message_client_mock._stream.write.return_value = []
|
|
self.assertEqual([], self.message_client_pool.write_to_stream(''))
|
|
self.message_client_pool.message_clients[2].send_queue = [0]
|
|
self.message_client_pool.message_clients[2]._stream.write.return_value = [1]
|
|
self.assertEqual([1], self.message_client_pool.write_to_stream(''))
|
|
|
|
def test_close(self):
|
|
self.message_client_pool.close()
|
|
self.assertEqual([], self.message_client_pool.message_clients)
|
|
|
|
def test_on_recv(self):
|
|
for message_client_mock in self.message_client_pool.message_clients:
|
|
message_client_mock.on_recv.return_value = None
|
|
self.message_client_pool.on_recv()
|
|
for message_client_mock in self.message_client_pool.message_clients:
|
|
self.assertTrue(message_client_mock.on_recv.called)
|
|
|
|
def test_connect_all(self):
|
|
@gen_test
|
|
def test_connect(self):
|
|
yield self.message_client_pool.connect()
|
|
|
|
for message_client_mock in self.message_client_pool.message_clients:
|
|
future = tornado.concurrent.Future()
|
|
future.set_result('foo')
|
|
message_client_mock.connect.return_value = future
|
|
|
|
self.assertIsNone(test_connect(self))
|
|
|
|
def test_connect_partial(self):
|
|
@gen_test(timeout=0.1)
|
|
def test_connect(self):
|
|
yield self.message_client_pool.connect()
|
|
|
|
for idx, message_client_mock in enumerate(self.message_client_pool.message_clients):
|
|
future = tornado.concurrent.Future()
|
|
if idx % 2 == 0:
|
|
future.set_result('foo')
|
|
message_client_mock.connect.return_value = future
|
|
|
|
with self.assertRaises(tornado.ioloop.TimeoutError):
|
|
test_connect(self)
|