From e230783584f09096fdbee25ff18a6c164bd1545e Mon Sep 17 00:00:00 2001
From: Eugine Blikh <bigbes@gmail.com>
Date: Fri, 26 Jul 2013 17:43:15 +0400
Subject: [PATCH] Fix for handling of --init-storage fail
---
test/lib/tarantool_server.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py
index 465091402e..5ec22b22cf 100644
--- a/test/lib/tarantool_server.py
+++ b/test/lib/tarantool_server.py
@@ -188,11 +188,13 @@ class TarantoolServer(Server):
def init(self):
# init storage
- subprocess.check_call([self.binary, "--init-storage"],
- cwd = self.vardir,
- # catch stdout/stderr to not clutter output
- stdout = subprocess.PIPE,
- stderr = subprocess.PIPE)
+ cmd = [self.binary, "--init-storage"]
+ _init = subprocess.Popen(cmd, cwd=self.vardir,
+ stderr = subprocess.STDOUT, stdout = subprocess.PIPE)
+ retcode = _init.wait()
+ if retcode:
+ sys.stderr.write("tarantool_box --init-storage error: \n%s\n" % _init.stdout.read())
+ raise subprocess.CalledProcessError(retcode, cmd)
def get_param(self, param):
if param:
--
GitLab