This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Tarantool -- an efficient key/value data store".
The branch master has been updated
via cd459120038eee1d96b5966763c7b870fa4157f2 (commit)
via 25c5ad8ed63cbab7628942ed979b66edc503c937 (commit)
from 7da4045d92316ea266251e86cc9963320d38660d (commit)
Summary of changes:
test/lib/server.py | 4 ++--
test/lib/tarantool_server.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit cd459120038eee1d96b5966763c7b870fa4157f2
Merge: 7da4045 25c5ad8
Author: Roman Tokarev <[email protected]>
Date: Wed Mar 23 12:03:25 2011 +0300
Merge remote branch 'origin/master-stable'
commit 25c5ad8ed63cbab7628942ed979b66edc503c937
Author: Roman Tokarev <[email protected]>
Date: Wed Mar 23 12:01:46 2011 +0300
Test-runner: Fix start-and-exit.
diff --git a/test/lib/server.py b/test/lib/server.py
index 061b9f2..659da68 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 b25e58e..7aeca3a 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")
--
Tarantool -- an efficient key/value data store
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
