Skip to content
Snippets Groups Projects
Commit 25c5ad8e authored by Roman Tokarev's avatar Roman Tokarev
Browse files

Test-runner: Fix start-and-exit.

parent 9cfb3f34
No related branches found
No related tags found
No related merge requests found
...@@ -133,7 +133,7 @@ class Server(object): ...@@ -133,7 +133,7 @@ class Server(object):
def init(self): def init(self):
pass 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 gdb != None: self.gdb = gdb
if valgrind != None: self.valgrind = valgrind if valgrind != None: self.valgrind = valgrind
...@@ -169,7 +169,7 @@ class Server(object): ...@@ -169,7 +169,7 @@ class Server(object):
elif self.valgrind: elif self.valgrind:
args = prepare_valgrind(args, self.valgrind_log) args = prepare_valgrind(args, self.valgrind_log)
if self.start_and_exit: if self.start_and_exit:
self.start_and_exit(args) self._start_and_exit(args)
else: else:
self.process = pexpect.spawn(args[0], args[1:], cwd = self.vardir) self.process = pexpect.spawn(args[0], args[1:], cwd = self.vardir)
# wait until the server is connectedk # wait until the server is connectedk
......
...@@ -62,12 +62,12 @@ class TarantoolServer(Server): ...@@ -62,12 +62,12 @@ class TarantoolServer(Server):
p.wait() p.wait()
return version 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 gdb != None: self.gdb = gdb
if valgrind != None: self.valgrind = valgrind if valgrind != None: self.valgrind = valgrind
if self.valgrind: if self.valgrind:
Server.start_and_exit(self, args) Server._start_and_exit(self, args)
else: else:
if not self.gdb: if not self.gdb:
args.append("--daemonize") args.append("--daemonize")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment