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

Cleanup

Browse source
This commit is contained in:
Mike Place 2014-05-09 16:00:36 -06:00 • committed by Pedro Algarvio
parent 0cbac67a3f
commit 1fe291346f
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/integration/__init__.py
View file

@ -346,21 +346,19 @@ class TestDaemon(object):
finally:
self.post_setup_minions()
def prep_ssh(self, sshd_port=2827):
def prep_ssh(self):
'''
Generate keys and start an ssh daemon on an alternate port
'''
keygen = salt.utils.which('ssh-keygen')
sshd = salt.utils.which('sshd')
print(keygen)
print(sshd)
if not (keygen and sshd):
print('WARNING: Could not initialize SSH subsystem. Tests for salt-ssh may break!')
return
if not os.path.exists(TMP_CONF_DIR):
os.makedirs(TMP_CONF_DIR)
keygen_process = subprocess.Popen(
[keygen, '-t', 'ecdsa', '-b', '521', '-C', '"$(whoami)@$(hostname)-$(date -I)"', '-f', 'key_test', '-P', 'INSECURE_TEMPORARY_KEY_PASSWORD'],
stdout=subprocess.PIPE,