From 887edff26e8d6b98cb4a7fa51f3986e174cde7a5 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@sv2test.novalocal>
Date: Fri, 11 Jan 2019 04:50:18 +0000
Subject: [PATCH] Revert "don't wait on the control socket. This might
introduce a race, on the other hand I've been experiencing hangs"
This reverts commit 217727503bf971a1ebb33ccc7528cdae766ce35e.
---
tes/sshwrapper/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tes/sshwrapper/__init__.py b/tes/sshwrapper/__init__.py
index e6ed238..3b9f6b9 100644
--- a/tes/sshwrapper/__init__.py
+++ b/tes/sshwrapper/__init__.py
@@ -94,11 +94,11 @@ class Ssh:
env['SSH_AUTH_SOCK'] = sess.socket
logger.debug("socket not found, starting new master")
ctrl_p = subprocess.Popen(sshcmd,
- stdout=None, stderr=None,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE,
stdin=None,
env=env)
logger.debug("master spawned, attempt communicate")
- #stdout, stderr = ctrl_p.communicate()
+ stdout, stderr = ctrl_p.communicate()
logger.debug('communicate on the control port complete')
sess.pids.append(ctrl_p.pid)
--
GitLab