From 4bf9d35e7441de81e9fb9c0285c5ce80f5b36454 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Thu, 11 Aug 2016 15:04:48 +0100 Subject: [PATCH] Better LocalStream bootstrap failure message. --- econtext/master.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/econtext/master.py b/econtext/master.py index 863b8222..0833996d 100644 --- a/econtext/master.py +++ b/econtext/master.py @@ -128,7 +128,7 @@ class LocalStream(econtext.core.Stream): Base for streams capable of starting new slaves. """ #: The path to the remote Python interpreter. - python_path = sys.executable + python_path = 'python' def __init__(self, context): super(LocalStream, self).__init__(context) @@ -201,7 +201,9 @@ class LocalStream(econtext.core.Stream): self, self.read_side.fd) econtext.core.write_all(self.write_side.fd, self.GetPreamble()) - assert os.read(self.read_side.fd, 3) == 'OK\n' + s = os.read(self.read_side.fd, 4096) + if s != 'OK\n': + raise econtext.core.StreamError('Bootstrap failed; stdout: %r', s) class SSHStream(LocalStream):