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 feature-get-all-keys has been updated
via d7b27f429ce1adf2f7c70212cbca7e21359077cd (commit)
via b6b7c4e8d5872e49cdc8a548a801b1562ba1a73b (commit)
via c5ac8439ae965341cf8d29e5f00eed32f6dc45c5 (commit)
via 541519dab2cfc20b2ad8ee0a12ad96d3dc083313 (commit)
via ca2e6cf4455fbb92dc4ca6b52d481005709823a1 (commit)
via 8f867142af60cbb300ca68a6ef9d2db2f57e7ba0 (commit)
via 7bd33e648ef81cfa95576ebe5c3f80deb476aed1 (commit)
from 28bba3be25c022a0b463a0cd1a074546fe7fea62 (commit)
Summary of changes:
core/log_io_remote.c | 2 +-
mod/silverbox/box.c | 4 +-
test/CMakeLists.txt | 2 +-
test/box/args.test | 3 +
test/box/bug726778.cfg | 2 +
test/box/configuration.test | 15 +--
test/box/get_all_keys.test | 8 +-
test/box/reconfigure.test | 55 ++------
test/box/show.test | 6 +-
test/box/snapshot.test | 10 +-
test/box/tarantool_bug708685.cfg | 2 +
test/box/xlog.test | 34 ++--
test/lib/server.py | 241 +++++++++++++++++++++++++++++
test/lib/silverbox.py | 61 ++++++++
test/lib/tarantool_admin.py | 50 ++++++
test/lib/tarantool_connection.py | 76 +---------
test/lib/tarantool_feeder_server.py | 17 ++
test/lib/tarantool_server.py | 81 ++++++++++
test/lib/tarantool_silverbox_server.py | 259 ++++----------------------------
test/lib/test_suite.py | 108 ++++---------
test/test-run.py | 47 ++++---
21 files changed, 608 insertions(+), 475 deletions(-)
create mode 100644 test/lib/server.py
create mode 100644 test/lib/silverbox.py
create mode 100644 test/lib/tarantool_admin.py
create mode 100644 test/lib/tarantool_feeder_server.py
create mode 100644 test/lib/tarantool_server.py
commit d7b27f429ce1adf2f7c70212cbca7e21359077cd
Author: Konstantin Osipov <[email protected]>
Date: Mon Mar 21 18:35:56 2011 +0300
After-merge fixes.
diff --git a/test/box/get_all_keys.test b/test/box/get_all_keys.test
index fd66c00..8baf3e1 100644
--- a/test/box/get_all_keys.test
+++ b/test/box/get_all_keys.test
@@ -1,9 +1,9 @@
# encoding: tarantool
# start test with clean storage
-server.stop(True)
-server.install(True)
-server.start(True)
+server.stop()
+server.deploy()
+server.start()
exec sql "ping"
@@ -23,3 +23,5 @@ exec sql "select k0 from t0"
exec sql "delete from t0 where k0 = 3"
exec sql "select k0 from t0"
+
+# vim: syntax=python
diff --git a/test/lib/server.py b/test/lib/server.py
index 061b9f2..3170bea 100644
--- a/test/lib/server.py
+++ b/test/lib/server.py
@@ -107,9 +107,12 @@ class Server(object):
The server working directory is taken from 'vardir',
specified in the program options."""
- if vardir != None: self.vardir = vardir
- if binary != None: self.binary = os.path.abspath(binary)
- if mem != None: self.mem = mem
+ if vardir != None:
+ self.vardir = vardir
+ if binary != None:
+ self.binary = os.path.abspath(binary)
+ if mem != None:
+ self.mem = mem
self.pidfile = os.path.abspath(os.path.join(self.vardir, self.pidfile))
self.valgrind_log = os.path.abspath(os.path.join(self.vardir,
self.valgrind_log))
commit b6b7c4e8d5872e49cdc8a548a801b1562ba1a73b
Merge: 28bba3b c5ac843
Author: Konstantin Osipov <[email protected]>
Date: Mon Mar 21 18:32:13 2011 +0300
Merge branch 'master-stable' into feature-get-all-keys
--
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
