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

Merge pull request #34291 from cachedout/fast_test_startup

Browse Source 
Increase the speed of test suite startup
This commit is contained in:
Mike Place 2016-06-30 16:26:48 -07:00 committed by GitHub
commit 1cde6b26ea
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/integration/__init__.py
View File

@ -378,7 +378,7 @@ class SaltScriptBase(ScriptPathMixin):
return []
class SaltDaemonScriptBase(SaltScriptBase):
class SaltDaemonScriptBase(SaltScriptBase, ShellTestCase):
'''
Base class for Salt Daemon CLI scripts
'''
@ -504,13 +504,12 @@ class SaltDaemonScriptBase(SaltScriptBase):
self._connectable.clear()
time.sleep(0.0125)
self._process.terminate()
self._process.join()
if HAS_PSUTIL:
# Lets log and kill any child processes which salt left behind
for child in children[:]:
try:
child.send_signal(signal.SIGTERM)
child.send_signal(signal.SIGKILL)
log.info('Salt left behind the following child process: %s', child.as_dict())
try:
child.wait(timeout=5)
@ -549,6 +548,7 @@ class SaltDaemonScriptBase(SaltScriptBase):
self._connectable.set()
break
for port in set(check_ports):
if isinstance(port, int):
log.trace('Checking connectable status on port: %s', port)
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
conn = sock.connect_ex(('localhost', port))
@ -558,6 +558,11 @@ class SaltDaemonScriptBase(SaltScriptBase):
sock.shutdown(socket.SHUT_RDWR)
sock.close()
del sock
elif isinstance(port, str):
joined = self.run_run('manage.joined', config_dir=self.config_dir)
joined = [x.lstrip('- ') for x in joined]
if port in joined:
check_ports.remove(port)
yield gen.sleep(0.125)
# A final sleep to allow the ioloop to do other things
yield gen.sleep(0.125)
@ -579,7 +584,7 @@ class SaltMinion(SaltDaemonScriptBase):
return script_args
def get_check_ports(self):
return set([self.config['runtests_conn_check_port']])
return set([self.config['id']])
class SaltMaster(SaltDaemonScriptBase):
@ -612,7 +617,7 @@ class SaltSyndic(SaltDaemonScriptBase):
return ['-l', 'quiet']
def get_check_ports(self):
return set([self.config['runtests_conn_check_port']])
return set()
class TestDaemon(object):
@ -1789,11 +1794,11 @@ class ShellCase(AdaptedConfigurationTestCaseMixIn, ShellTestCase, ScriptPathMixi
arg_str = '-W -c {0} -i --priv {1} --roster-file {2} --out=json localhost {3}'.format(self.get_config_dir(), os.path.join(TMP_CONF_DIR, 'key_test'), os.path.join(TMP_CONF_DIR, 'roster'), arg_str)
return self.run_script('salt-ssh', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, raw=True)
def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async=False, timeout=60):
def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async=False, timeout=60, config_dir=None):
'''
Execute salt-run
'''
arg_str = '-c {0}{async_flag} -t {timeout} {1}'.format(self.get_config_dir(),
arg_str = '-c {0}{async_flag} -t {timeout} {1}'.format(config_dir or self.get_config_dir(),
arg_str,
timeout=timeout,
async_flag=' --async' if async else '')