From 25c5ad8ed63cbab7628942ed979b66edc503c937 Mon Sep 17 00:00:00 2001
From: Roman Tokarev <rtokarev@corp.mail.ru>
Date: Wed, 23 Mar 2011 12:01:46 +0300
Subject: [PATCH] Test-runner: Fix start-and-exit.
---
test/lib/server.py | 4 ++--
test/lib/tarantool_server.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/lib/server.py b/test/lib/server.py
index 061b9f25e5..659da68af9 100644
--- a/test/lib/server.py
+++ b/test/lib/server.py
@@ -133,7 +133,7 @@ class Server(object):
def init(self):
pass
- def start_and_exit(self, args, gdb=None, valgrind=None):
+ def _start_and_exit(self, args, gdb=None, valgrind=None):
if gdb != None: self.gdb = gdb
if valgrind != None: self.valgrind = valgrind
@@ -169,7 +169,7 @@ class Server(object):
elif self.valgrind:
args = prepare_valgrind(args, self.valgrind_log)
if self.start_and_exit:
- self.start_and_exit(args)
+ self._start_and_exit(args)
else:
self.process = pexpect.spawn(args[0], args[1:], cwd = self.vardir)
# wait until the server is connectedk
diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py
index b25e58e76c..7aeca3a413 100644
--- a/test/lib/tarantool_server.py
+++ b/test/lib/tarantool_server.py
@@ -62,12 +62,12 @@ class TarantoolServer(Server):
p.wait()
return version
- def start_and_exit(self, args, gdb=None, valgrind=None):
+ def _start_and_exit(self, args, gdb=None, valgrind=None):
if gdb != None: self.gdb = gdb
if valgrind != None: self.valgrind = valgrind
if self.valgrind:
- Server.start_and_exit(self, args)
+ Server._start_and_exit(self, args)
else:
if not self.gdb:
args.append("--daemonize")
--
GitLab