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

Turn subprocesses logging proxying back on.

Browse source 
Make sure none of the hard coded ports are used when grabbing an unused port
This commit is contained in:
Pedro Algarvio 2016-05-23 13:54:02 +01:00
parent 17798f7b69
commit 320dc0b606
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tests/integration/__init__.py
View file

@ -166,6 +166,11 @@ def get_unused_localhost_port():
usock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
usock.bind(('127.0.0.1', 0))
port = usock.getsockname()[1]
if port in (54505, 54506, 64505, 64506, 64510, 64511):
# These ports are hardcoded in the test configuration
usock.close()
return get_unused_localhost_port()
_RUNTESTS_PORTS[port] = usock
return port
@ -677,10 +682,10 @@ class TestDaemon(object):
'''
Fire up the daemons used for zeromq tests
'''
#self.log_server = ThreadedSocketServer(('localhost', SALT_LOG_PORT), SocketServerRequestHandler)
#self.log_server_process = threading.Thread(target=self.log_server.serve_forever)
#self.log_server_process.daemon = True
#self.log_server_process.start()
self.log_server = ThreadedSocketServer(('localhost', SALT_LOG_PORT), SocketServerRequestHandler)
self.log_server_process = threading.Thread(target=self.log_server.serve_forever)
self.log_server_process.daemon = True
self.log_server_process.start()
self.master_process = SaltMaster(self.master_opts, TMP_CONF_DIR, SCRIPT_DIR)
self.master_process.display_name = 'salt-master'
@ -1063,10 +1068,10 @@ class TestDaemon(object):
conf['engines_dirs'].insert(0, ENGINES_DIR)
#if 'log_handlers_dirs' not in conf:
# conf['log_handlers_dirs'] = []
#conf['log_handlers_dirs'].insert(0, LOG_HANDLERS_DIR)
#conf['runtests_log_port'] = SALT_LOG_PORT
if 'log_handlers_dirs' not in conf:
conf['log_handlers_dirs'] = []
conf['log_handlers_dirs'].insert(0, LOG_HANDLERS_DIR)
conf['runtests_log_port'] = SALT_LOG_PORT
# ----- Transcribe Configuration ---------------------------------------------------------------------------->
for entry in os.listdir(CONF_DIR):
@ -1205,10 +1210,11 @@ class TestDaemon(object):
# self.smaster_process.join()
#except AttributeError:
# pass
#self.log_server.server_close()
#self.log_server.shutdown()
self.log_server.server_close()
self.log_server.shutdown()
self._exit_mockbin()
self._exit_ssh()
self.log_server_process.join()
# Shutdown the multiprocessing logging queue listener
salt_log_setup.shutdown_multiprocessing_logging()
salt_log_setup.shutdown_multiprocessing_logging_listener()