@@ -262,6 +262,7 @@ def SSHCall(command, logger, timeout=None, **opts):
time.sleep(5)
try:
process.kill()
+ process.wait()
except OSError:
logger.debug('OSError when killing process')
pass
@@ -284,6 +285,7 @@ def SSHCall(command, logger, timeout=None, **opts):
except TimeoutExpired:
try:
process.kill()
+ process.wait()
except OSError:
logger.debug('OSError')
pass
@@ -313,6 +315,7 @@ def SSHCall(command, logger, timeout=None, **opts):
# whilst running and ensure we don't leave a process behind.
if process.poll() is None:
process.kill()
+ process.wait()
logger.debug('Something went wrong, killing SSH process')
raise