From b105cbe3c97a203180e515417cbb1eb197b764ca Mon Sep 17 00:00:00 2001
From: Eugine Blikh <bigbes@gmail.com>
Date: Mon, 8 Jul 2013 20:56:22 +0400
Subject: [PATCH] Delete tarantool_preprocessor. Move to __call__ and recv,
send methods. Refactor test-files. Add forgotten tarantool error.
---
test/big/bitset.test | 78 +--
test/big/hash.test | 312 ++++-----
test/big/hash_multipart.test | 46 +-
test/big/iterator.test | 238 +++----
test/big/lua.test | 316 +++++-----
test/big/sql.test | 246 ++++----
test/big/tree_pk.test | 234 +++----
test/big/tree_pk_multipart.test | 186 +++---
test/big/tree_variants.test | 74 +--
test/box/admin.test | 26 +-
test/box/admin_coredump.test | 4 +-
test/box/cjson.test | 20 +-
test/box/configuration.test | 16 +-
test/box/errinj.test | 70 +--
test/box/fiber.test | 132 ++--
test/box/info.test | 48 +-
test/box/ipc.test | 114 ++--
test/box/iproto.test | 4 +-
test/box/lua.test | 940 ++++++++++++++--------------
test/box/lua_box_uuid.skipcond | 4 +-
test/box/lua_box_uuid.test | 8 +-
test/box/lua_misc.test | 36 +-
test/box/net.box.test | 94 +--
test/box/net_sql.mysql.skipcond | 2 +-
test/box/net_sql.mysql.test | 40 +-
test/box/net_sql.pg.skipcond | 2 +-
test/box/net_sql.pg.test | 72 +--
test/box/protocol.test | 4 +-
test/box/reconfigure.test | 30 +-
test/box/session.test | 90 +--
test/box/snapshot.test | 24 +-
test/box/socket.test | 402 ++++++------
test/box/sql.test | 82 +--
test/box/stat.test | 10 +-
test/box/xlog.test | 14 +-
test/lib/sql_ast.py | 2 +-
test/lib/tarantool_connection.py | 4 +-
test/lib/tarantool_preprocessor.py | 155 -----
test/lib/tarantool_server.py | 2 -
test/lib/test_suite.py | 1 -
test/lib/unittest_server.py | 1 -
test/memcached/binary-get.test | 6 +-
test/memcached/bogus-commands.test | 4 +-
test/memcached/cas.test | 56 +-
test/memcached/expirations.test | 30 +-
test/memcached/flags.test | 6 +-
test/memcached/flush-all.test | 26 +-
test/memcached/getset.test | 76 +--
test/memcached/incrdecr.test | 42 +-
test/memcached/lua.test | 12 +-
test/memcached/multiversioning.test | 14 +-
test/memcached/noreply.test | 46 +-
test/memcached/off.test | 4 +-
test/replication/consistent.test | 8 +-
test/replication/hot_standby.test | 14 +-
test/replication/memcached.test | 54 +-
test/replication/swap.test | 6 +-
test/wal/lua.test | 12 +-
test/wal/oom.test | 32 +-
test/wal/wal_mode.test | 26 +-
60 files changed, 2250 insertions(+), 2407 deletions(-)
delete mode 100644 test/lib/tarantool_preprocessor.py
diff --git a/test/big/bitset.test b/test/big/bitset.test
index fca6bc10c3..44920c8a2b 100644
--- a/test/big/bitset.test
+++ b/test/big/bitset.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
#
import os
@@ -8,7 +8,7 @@ for file in ("utils.lua", "bitset.lua"):
src_path = os.path.join("big/", file)
dst_path = os.path.join(vardir, file)
shutil.copy(src_path, dst_path)
- exec admin "lua dofile('%s')" % (file)
+ admin("lua dofile('%s')" % (file), silent=False)
os.unlink(dst_path);
print """
@@ -17,7 +17,7 @@ print """
#-----------------------------------------------------------------------------#
""";
-exec admin "lua test_insert_delete(128)"
+admin("lua test_insert_delete(128)", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -25,9 +25,9 @@ print """
#-----------------------------------------------------------------------------#
""";
-exec admin "lua clear()"
-exec admin "lua fill(1, 128)"
-exec admin "lua dump(box.index.BITS_ALL)"
+admin("lua clear()", silent=False)
+admin("lua fill(1, 128)", silent=False)
+admin("lua dump(box.index.BITS_ALL)", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -35,14 +35,14 @@ print """
#-----------------------------------------------------------------------------#
""";
-exec admin "lua dump(box.index.BITS_ALL_SET, 0)"
+admin("lua dump(box.index.BITS_ALL_SET, 0)", silent=False)
-exec admin "lua dump(box.index.BITS_ALL_SET, 1)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 2)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 8)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 1073741824)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 2147483648)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 4294967296)"
+admin("lua dump(box.index.BITS_ALL_SET, 1)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 2)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 8)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 1073741824)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 2147483648)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 4294967296)", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -50,15 +50,15 @@ print """
#-----------------------------------------------------------------------------#
""";
-exec admin "lua dump(box.index.BITS_ALL_SET, 3)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 7)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 31)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 5)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 10)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 27)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 341)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 2147483649)"
-exec admin "lua dump(box.index.BITS_ALL_SET, 4294967295)"
+admin("lua dump(box.index.BITS_ALL_SET, 3)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 7)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 31)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 5)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 10)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 27)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 341)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 2147483649)", silent=False)
+admin("lua dump(box.index.BITS_ALL_SET, 4294967295)", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -66,11 +66,11 @@ print """
#-----------------------------------------------------------------------------#
""";
-exec admin "lua dump(box.index.BITS_ALL_NOT_SET, 0)"
+admin("lua dump(box.index.BITS_ALL_NOT_SET, 0)", silent=False)
-exec admin "lua dump(box.index.BITS_ALL_NOT_SET, 2)"
-exec admin "lua dump(box.index.BITS_ALL_NOT_SET, 8)"
-exec admin "lua dump(box.index.BITS_ALL_NOT_SET, 4294967296)"
+admin("lua dump(box.index.BITS_ALL_NOT_SET, 2)", silent=False)
+admin("lua dump(box.index.BITS_ALL_NOT_SET, 8)", silent=False)
+admin("lua dump(box.index.BITS_ALL_NOT_SET, 4294967296)", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -78,12 +78,12 @@ print """
#-----------------------------------------------------------------------------#
""";
-exec admin "lua dump(box.index.BITS_ALL_NOT_SET, 3)"
-exec admin "lua dump(box.index.BITS_ALL_NOT_SET, 7)"
-exec admin "lua dump(box.index.BITS_ALL_NOT_SET, 10)"
-exec admin "lua dump(box.index.BITS_ALL_NOT_SET, 27)"
-exec admin "lua dump(box.index.BITS_ALL_NOT_SET, 85)"
-exec admin "lua dump(box.index.BITS_ALL_NOT_SET, 4294967295)"
+admin("lua dump(box.index.BITS_ALL_NOT_SET, 3)", silent=False)
+admin("lua dump(box.index.BITS_ALL_NOT_SET, 7)", silent=False)
+admin("lua dump(box.index.BITS_ALL_NOT_SET, 10)", silent=False)
+admin("lua dump(box.index.BITS_ALL_NOT_SET, 27)", silent=False)
+admin("lua dump(box.index.BITS_ALL_NOT_SET, 85)", silent=False)
+admin("lua dump(box.index.BITS_ALL_NOT_SET, 4294967295)", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -91,11 +91,11 @@ print """
#-----------------------------------------------------------------------------#
""";
-exec admin "lua dump(box.index.BITS_ANY_SET, 0)"
+admin("lua dump(box.index.BITS_ANY_SET, 0)", silent=False)
-exec admin "lua dump(box.index.BITS_ANY_SET, 16)"
-exec admin "lua dump(box.index.BITS_ANY_SET, 128)"
-exec admin "lua dump(box.index.BITS_ANY_SET, 4294967296)"
+admin("lua dump(box.index.BITS_ANY_SET, 16)", silent=False)
+admin("lua dump(box.index.BITS_ANY_SET, 128)", silent=False)
+admin("lua dump(box.index.BITS_ANY_SET, 4294967296)", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -103,6 +103,6 @@ print """
#-----------------------------------------------------------------------------#
""";
-exec admin "lua dump(box.index.BITS_ANY_SET, 7)"
-exec admin "lua dump(box.index.BITS_ANY_SET, 84)"
-exec admin "lua dump(box.index.BITS_ANY_SET, 113)"
+admin("lua dump(box.index.BITS_ANY_SET, 7)", silent=False)
+admin("lua dump(box.index.BITS_ANY_SET, 84)", silent=False)
+admin("lua dump(box.index.BITS_ANY_SET, 113)", silent=False)
diff --git a/test/big/hash.test b/test/big/hash.test
index 79b510266f..d5bf1e70e1 100644
--- a/test/big/hash.test
+++ b/test/big/hash.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
#
print """
@@ -16,15 +16,15 @@ print """
print """
# Insert valid fieds
"""
-exec admin "lua box.space[10]:insert(0, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[10]:insert(1, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[10]:insert(2, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[10]:insert(3, 'value1 v1.0', 'value2 v1.0')"
+admin("lua box.space[10]:insert(0, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[10]:insert(1, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[10]:insert(2, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[10]:insert(3, 'value1 v1.0', 'value2 v1.0')", silent=False)
print """
# Insert invalid fields
"""
-exec admin "lua box.space[10]:insert('invalid key', 'value1 v1.0', 'value2 v1.0')"
+admin("lua box.space[10]:insert('invalid key', 'value1 v1.0', 'value2 v1.0')", silent=False)
print """
@@ -36,14 +36,14 @@ print """
print """
# Replace valid fieds
"""
-exec admin "lua box.space[10]:replace(3, 'value1 v1.31', 'value2 1.12')"
-exec admin "lua box.space[10]:replace(1, 'value1 v1.32', 'value2 1.72')"
-exec admin "lua box.space[10]:replace(2, 'value1 v1.43', 'value2 1.92')"
+admin("lua box.space[10]:replace(3, 'value1 v1.31', 'value2 1.12')", silent=False)
+admin("lua box.space[10]:replace(1, 'value1 v1.32', 'value2 1.72')", silent=False)
+admin("lua box.space[10]:replace(2, 'value1 v1.43', 'value2 1.92')", silent=False)
print """
# Replace invalid fields
"""
-exec admin "lua box.space[10]:replace('invalid key', 'value1 v1.0', 'value2 v1.0')"
+admin("lua box.space[10]:replace('invalid key', 'value1 v1.0', 'value2 v1.0')", silent=False)
print """
@@ -55,18 +55,18 @@ print """
print """
# select by valid keys
"""
-exec admin "lua box.space[10]:select(0, 0)"
-exec admin "lua box.space[10]:select(0, 1)"
-exec admin "lua box.space[10]:select(0, 2)"
-exec admin "lua box.space[10]:select(0, 3)"
-exec admin "lua box.space[10]:select(0, 4)"
-exec admin "lua box.space[10]:select(0, 5)"
+admin("lua box.space[10]:select(0, 0)", silent=False)
+admin("lua box.space[10]:select(0, 1)", silent=False)
+admin("lua box.space[10]:select(0, 2)", silent=False)
+admin("lua box.space[10]:select(0, 3)", silent=False)
+admin("lua box.space[10]:select(0, 4)", silent=False)
+admin("lua box.space[10]:select(0, 5)", silent=False)
print """
# select by invalid keys
"""
-exec admin "lua box.space[10]:select(0, 'invalid key')"
-exec admin "lua box.space[10]:select(0, 1, 2)"
+admin("lua box.space[10]:select(0, 'invalid key')", silent=False)
+admin("lua box.space[10]:select(0, 1, 2)", silent=False)
print """
@@ -78,18 +78,18 @@ print """
print """
# delete by valid keys
"""
-exec admin "lua box.space[10]:delete(0)"
-exec admin "lua box.space[10]:delete(1)"
-exec admin "lua box.space[10]:delete(2)"
-exec admin "lua box.space[10]:delete(3)"
-exec admin "lua box.space[10]:delete(4)"
-exec admin "lua box.space[10]:delete(5)"
+admin("lua box.space[10]:delete(0)", silent=False)
+admin("lua box.space[10]:delete(1)", silent=False)
+admin("lua box.space[10]:delete(2)", silent=False)
+admin("lua box.space[10]:delete(3)", silent=False)
+admin("lua box.space[10]:delete(4)", silent=False)
+admin("lua box.space[10]:delete(5)", silent=False)
print """
# delete by invalid keys
"""
-exec admin "lua box.space[10]:delete('invalid key')"
-exec admin "lua box.space[10]:delete(1, 2)"
+admin("lua box.space[10]:delete('invalid key')", silent=False)
+admin("lua box.space[10]:delete(1, 2)", silent=False)
print """
@@ -107,19 +107,19 @@ print """
print """
# Insert valid fieds
"""
-exec admin "lua box.space[11]:insert(0ULL, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[11]:insert(1ULL, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[11]:insert(2ULL, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[11]:insert(3ULL, 'value1 v1.0', 'value2 v1.0')"
+admin("lua box.space[11]:insert(0ULL, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[11]:insert(1ULL, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[11]:insert(2ULL, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[11]:insert(3ULL, 'value1 v1.0', 'value2 v1.0')", silent=False)
print """
# Insert invalid fields
"""
-exec admin "lua box.space[11]:insert(100, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[11]:insert(101, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[11]:insert(102, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[11]:insert(103, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[11]:insert('invalid key', 'value1 v1.0', 'value2 v1.0')"
+admin("lua box.space[11]:insert(100, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[11]:insert(101, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[11]:insert(102, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[11]:insert(103, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[11]:insert('invalid key', 'value1 v1.0', 'value2 v1.0')", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -130,17 +130,17 @@ print """
print """
# Replace valid fieds
"""
-exec admin "lua box.space[11]:replace(3ULL, 'value1 v1.31', 'value2 1.12')"
-exec admin "lua box.space[11]:replace(1ULL, 'value1 v1.32', 'value2 1.72')"
-exec admin "lua box.space[11]:replace(2ULL, 'value1 v1.43', 'value2 1.92')"
+admin("lua box.space[11]:replace(3ULL, 'value1 v1.31', 'value2 1.12')", silent=False)
+admin("lua box.space[11]:replace(1ULL, 'value1 v1.32', 'value2 1.72')", silent=False)
+admin("lua box.space[11]:replace(2ULL, 'value1 v1.43', 'value2 1.92')", silent=False)
print """
# Replace invalid fields
"""
-exec admin "lua box.space[11]:replace(3, 'value1 v1.31', 'value2 1.12')"
-exec admin "lua box.space[11]:replace(1, 'value1 v1.32', 'value2 1.72')"
-exec admin "lua box.space[11]:replace(2, 'value1 v1.43', 'value2 1.92')"
-exec admin "lua box.space[11]:replace('invalid key', 'value1 v1.0', 'value2 v1.0')"
+admin("lua box.space[11]:replace(3, 'value1 v1.31', 'value2 1.12')", silent=False)
+admin("lua box.space[11]:replace(1, 'value1 v1.32', 'value2 1.72')", silent=False)
+admin("lua box.space[11]:replace(2, 'value1 v1.43', 'value2 1.92')", silent=False)
+admin("lua box.space[11]:replace('invalid key', 'value1 v1.0', 'value2 v1.0')", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -151,28 +151,28 @@ print """
print """
# select by valid keys
"""
-exec admin "lua box.space[11]:select(0, 0ULL)"
-exec admin "lua box.space[11]:select(0, 1ULL)"
-exec admin "lua box.space[11]:select(0, 2ULL)"
-exec admin "lua box.space[11]:select(0, 3ULL)"
-exec admin "lua box.space[11]:select(0, 4ULL)"
-exec admin "lua box.space[11]:select(0, 5ULL)"
+admin("lua box.space[11]:select(0, 0ULL)", silent=False)
+admin("lua box.space[11]:select(0, 1ULL)", silent=False)
+admin("lua box.space[11]:select(0, 2ULL)", silent=False)
+admin("lua box.space[11]:select(0, 3ULL)", silent=False)
+admin("lua box.space[11]:select(0, 4ULL)", silent=False)
+admin("lua box.space[11]:select(0, 5ULL)", silent=False)
print """
# select by valid NUM keys
"""
-exec admin "lua box.space[11]:select(0, 0)"
-exec admin "lua box.space[11]:select(0, 1)"
-exec admin "lua box.space[11]:select(0, 2)"
-exec admin "lua box.space[11]:select(0, 3)"
-exec admin "lua box.space[11]:select(0, 4)"
-exec admin "lua box.space[11]:select(0, 5)"
+admin("lua box.space[11]:select(0, 0)", silent=False)
+admin("lua box.space[11]:select(0, 1)", silent=False)
+admin("lua box.space[11]:select(0, 2)", silent=False)
+admin("lua box.space[11]:select(0, 3)", silent=False)
+admin("lua box.space[11]:select(0, 4)", silent=False)
+admin("lua box.space[11]:select(0, 5)", silent=False)
print """
# select by invalid keys
"""
-exec admin "lua box.space[11]:select(0, 'invalid key')"
-exec admin "lua box.space[11]:select(0, '00000001', '00000002')"
+admin("lua box.space[11]:select(0, 'invalid key')", silent=False)
+admin("lua box.space[11]:select(0, '00000001', '00000002')", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -183,33 +183,33 @@ print """
print """
# delete by valid keys
"""
-exec admin "lua box.space[11]:delete(0ULL)"
-exec admin "lua box.space[11]:delete(1ULL)"
-exec admin "lua box.space[11]:delete(2ULL)"
-exec admin "lua box.space[11]:delete(3ULL)"
-exec admin "lua box.space[11]:delete(4ULL)"
-exec admin "lua box.space[11]:delete(5ULL)"
+admin("lua box.space[11]:delete(0ULL)", silent=False)
+admin("lua box.space[11]:delete(1ULL)", silent=False)
+admin("lua box.space[11]:delete(2ULL)", silent=False)
+admin("lua box.space[11]:delete(3ULL)", silent=False)
+admin("lua box.space[11]:delete(4ULL)", silent=False)
+admin("lua box.space[11]:delete(5ULL)", silent=False)
-exec admin "lua box.space[11]:insert(0ULL, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[11]:insert(1ULL, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[11]:insert(2ULL, 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[11]:insert(3ULL, 'value1 v1.0', 'value2 v1.0')"
+admin("lua box.space[11]:insert(0ULL, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[11]:insert(1ULL, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[11]:insert(2ULL, 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[11]:insert(3ULL, 'value1 v1.0', 'value2 v1.0')", silent=False)
print """
# delete by valid NUM keys
"""
-exec admin "lua box.space[11]:delete(0)"
-exec admin "lua box.space[11]:delete(1)"
-exec admin "lua box.space[11]:delete(2)"
-exec admin "lua box.space[11]:delete(3)"
-exec admin "lua box.space[11]:delete(4)"
-exec admin "lua box.space[11]:delete(5)"
+admin("lua box.space[11]:delete(0)", silent=False)
+admin("lua box.space[11]:delete(1)", silent=False)
+admin("lua box.space[11]:delete(2)", silent=False)
+admin("lua box.space[11]:delete(3)", silent=False)
+admin("lua box.space[11]:delete(4)", silent=False)
+admin("lua box.space[11]:delete(5)", silent=False)
print """
# delete by invalid keys
"""
-exec admin "lua box.space[11]:delete('invalid key')"
-exec admin "lua box.space[11]:delete('00000001', '00000002')"
+admin("lua box.space[11]:delete('invalid key')", silent=False)
+admin("lua box.space[11]:delete('00000001', '00000002')", silent=False)
print """
@@ -227,10 +227,10 @@ print """
print """
# Insert valid fieds
"""
-exec admin "lua box.space[12]:insert('key 0', 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[12]:insert('key 1', 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[12]:insert('key 2', 'value1 v1.0', 'value2 v1.0')"
-exec admin "lua box.space[12]:insert('key 3', 'value1 v1.0', 'value2 v1.0')"
+admin("lua box.space[12]:insert('key 0', 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[12]:insert('key 1', 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[12]:insert('key 2', 'value1 v1.0', 'value2 v1.0')", silent=False)
+admin("lua box.space[12]:insert('key 3', 'value1 v1.0', 'value2 v1.0')", silent=False)
print """
@@ -242,9 +242,9 @@ print """
print """
# Replace valid fieds
"""
-exec admin "lua box.space[12]:replace('key 3', 'value1 v1.31', 'value2 1.12')"
-exec admin "lua box.space[12]:replace('key 1', 'value1 v1.32', 'value2 1.72')"
-exec admin "lua box.space[12]:replace('key 2', 'value1 v1.43', 'value2 1.92')"
+admin("lua box.space[12]:replace('key 3', 'value1 v1.31', 'value2 1.12')", silent=False)
+admin("lua box.space[12]:replace('key 1', 'value1 v1.32', 'value2 1.72')", silent=False)
+admin("lua box.space[12]:replace('key 2', 'value1 v1.43', 'value2 1.92')", silent=False)
print """
@@ -256,17 +256,17 @@ print """
print """
# select by valid keys
"""
-exec admin "lua box.space[12]:select(0, 'key 0')"
-exec admin "lua box.space[12]:select(0, 'key 1')"
-exec admin "lua box.space[12]:select(0, 'key 2')"
-exec admin "lua box.space[12]:select(0, 'key 3')"
-exec admin "lua box.space[12]:select(0, 'key 4')"
-exec admin "lua box.space[12]:select(0, 'key 5')"
+admin("lua box.space[12]:select(0, 'key 0')", silent=False)
+admin("lua box.space[12]:select(0, 'key 1')", silent=False)
+admin("lua box.space[12]:select(0, 'key 2')", silent=False)
+admin("lua box.space[12]:select(0, 'key 3')", silent=False)
+admin("lua box.space[12]:select(0, 'key 4')", silent=False)
+admin("lua box.space[12]:select(0, 'key 5')", silent=False)
print """
# select by invalid keys
"""
-exec admin "lua box.space[12]:select(0, 'key 1', 'key 2')"
+admin("lua box.space[12]:select(0, 'key 1', 'key 2')", silent=False)
print """
@@ -278,100 +278,100 @@ print """
print """
# delete by valid keys
"""
-exec admin "lua box.space[12]:delete('key 0')"
-exec admin "lua box.space[12]:delete('key 1')"
-exec admin "lua box.space[12]:delete('key 2')"
-exec admin "lua box.space[12]:delete('key 3')"
-exec admin "lua box.space[12]:delete('key 4')"
-exec admin "lua box.space[12]:delete('key 5')"
+admin("lua box.space[12]:delete('key 0')", silent=False)
+admin("lua box.space[12]:delete('key 1')", silent=False)
+admin("lua box.space[12]:delete('key 2')", silent=False)
+admin("lua box.space[12]:delete('key 3')", silent=False)
+admin("lua box.space[12]:delete('key 4')", silent=False)
+admin("lua box.space[12]:delete('key 5')", silent=False)
print """
# delete by invalid keys
"""
-exec admin "lua box.space[12]:delete('key 1', 'key 2')"
+admin("lua box.space[12]:delete('key 1', 'key 2')", silent=False)
# clean-up
-exec admin "lua box.space[10]:truncate()"
-exec admin "lua box.space[11]:truncate()"
-exec admin "lua box.space[12]:truncate()"
+admin("lua box.space[10]:truncate()", silent=False)
+admin("lua box.space[11]:truncate()", silent=False)
+admin("lua box.space[12]:truncate()", silent=False)
#
# hash::replace tests
#
-exec admin "lua box.space[21]:truncate()"
+admin("lua box.space[21]:truncate()", silent=False)
-exec sql "insert into t21 values (0, 0, 0, 0)"
-exec sql "insert into t21 values (1, 1, 1, 1)"
-exec sql "insert into t21 values (2, 2, 2, 2)"
+sql("insert into t21 values (0, 0, 0, 0)", silent=False)
+sql("insert into t21 values (1, 1, 1, 1)", silent=False)
+sql("insert into t21 values (2, 2, 2, 2)", silent=False)
# OK
-exec sql "replace into t21 values (1, 1, 1, 1)"
-exec sql "replace into t21 values (1, 10, 10, 10)"
-exec sql "replace into t21 values (1, 1, 1, 1)"
-exec sql "select * from t21 WHERE k0 = 10"
-exec sql "select * from t21 WHERE k1 = 10"
-exec sql "select * from t21 WHERE k2 = 10"
-exec sql "select * from t21 WHERE k3 = 10"
-exec sql "select * from t21 WHERE k0 = 1"
-exec sql "select * from t21 WHERE k1 = 1"
-exec sql "select * from t21 WHERE k2 = 1"
-exec sql "select * from t21 WHERE k3 = 1"
+sql("replace into t21 values (1, 1, 1, 1)", silent=False)
+sql("replace into t21 values (1, 10, 10, 10)", silent=False)
+sql("replace into t21 values (1, 1, 1, 1)", silent=False)
+sql("select * from t21 WHERE k0 = 10", silent=False)
+sql("select * from t21 WHERE k1 = 10", silent=False)
+sql("select * from t21 WHERE k2 = 10", silent=False)
+sql("select * from t21 WHERE k3 = 10", silent=False)
+sql("select * from t21 WHERE k0 = 1", silent=False)
+sql("select * from t21 WHERE k1 = 1", silent=False)
+sql("select * from t21 WHERE k2 = 1", silent=False)
+sql("select * from t21 WHERE k3 = 1", silent=False)
# OK
-exec sql "insert into t21 values (10, 10, 10, 10)"
-exec sql "delete from t21 WHERE k0 = 10"
-exec sql "select * from t21 WHERE k0 = 10"
-exec sql "select * from t21 WHERE k1 = 10"
-exec sql "select * from t21 WHERE k2 = 10"
-exec sql "select * from t21 WHERE k3 = 10"
+sql("insert into t21 values (10, 10, 10, 10)", silent=False)
+sql("delete from t21 WHERE k0 = 10", silent=False)
+sql("select * from t21 WHERE k0 = 10", silent=False)
+sql("select * from t21 WHERE k1 = 10", silent=False)
+sql("select * from t21 WHERE k2 = 10", silent=False)
+sql("select * from t21 WHERE k3 = 10", silent=False)
# TupleFound (primary key)
-exec sql "insert into t21 values (1, 10, 10, 10)"
-exec sql "select * from t21 WHERE k0 = 10"
-exec sql "select * from t21 WHERE k1 = 10"
-exec sql "select * from t21 WHERE k2 = 10"
-exec sql "select * from t21 WHERE k3 = 10"
-exec sql "select * from t21 WHERE k0 = 1"
+sql("insert into t21 values (1, 10, 10, 10)", silent=False)
+sql("select * from t21 WHERE k0 = 10", silent=False)
+sql("select * from t21 WHERE k1 = 10", silent=False)
+sql("select * from t21 WHERE k2 = 10", silent=False)
+sql("select * from t21 WHERE k3 = 10", silent=False)
+sql("select * from t21 WHERE k0 = 1", silent=False)
# TupleNotFound (primary key)
-exec sql "replace into t21 values (10, 10, 10, 10)"
-exec sql "select * from t21 WHERE k0 = 10"
-exec sql "select * from t21 WHERE k1 = 10"
-exec sql "select * from t21 WHERE k2 = 10"
-exec sql "select * from t21 WHERE k3 = 10"
+sql("replace into t21 values (10, 10, 10, 10)", silent=False)
+sql("select * from t21 WHERE k0 = 10", silent=False)
+sql("select * from t21 WHERE k1 = 10", silent=False)
+sql("select * from t21 WHERE k2 = 10", silent=False)
+sql("select * from t21 WHERE k3 = 10", silent=False)
# TupleFound (key #1)
-exec sql "insert into t21 values (10, 0, 10, 10)"
-exec sql "select * from t21 WHERE k0 = 10"
-exec sql "select * from t21 WHERE k1 = 10"
-exec sql "select * from t21 WHERE k2 = 10"
-exec sql "select * from t21 WHERE k3 = 10"
-exec sql "select * from t21 WHERE k1 = 0"
+sql("insert into t21 values (10, 0, 10, 10)", silent=False)
+sql("select * from t21 WHERE k0 = 10", silent=False)
+sql("select * from t21 WHERE k1 = 10", silent=False)
+sql("select * from t21 WHERE k2 = 10", silent=False)
+sql("select * from t21 WHERE k3 = 10", silent=False)
+sql("select * from t21 WHERE k1 = 0", silent=False)
# TupleFound (key #1)
-exec sql "replace into t21 values (2, 0, 10, 10)"
-exec sql "select * from t21 WHERE k0 = 10"
-exec sql "select * from t21 WHERE k1 = 10"
-exec sql "select * from t21 WHERE k2 = 10"
-exec sql "select * from t21 WHERE k3 = 10"
-exec sql "select * from t21 WHERE k1 = 0"
+sql("replace into t21 values (2, 0, 10, 10)", silent=False)
+sql("select * from t21 WHERE k0 = 10", silent=False)
+sql("select * from t21 WHERE k1 = 10", silent=False)
+sql("select * from t21 WHERE k2 = 10", silent=False)
+sql("select * from t21 WHERE k3 = 10", silent=False)
+sql("select * from t21 WHERE k1 = 0", silent=False)
# TupleFound (key #3)
-exec sql "insert into t21 values (10, 10, 10, 0)"
-exec sql "select * from t21 WHERE k0 = 10"
-exec sql "select * from t21 WHERE k1 = 10"
-exec sql "select * from t21 WHERE k2 = 10"
-exec sql "select * from t21 WHERE k3 = 10"
-exec sql "select * from t21 WHERE k3 = 0"
+sql("insert into t21 values (10, 10, 10, 0)", silent=False)
+sql("select * from t21 WHERE k0 = 10", silent=False)
+sql("select * from t21 WHERE k1 = 10", silent=False)
+sql("select * from t21 WHERE k2 = 10", silent=False)
+sql("select * from t21 WHERE k3 = 10", silent=False)
+sql("select * from t21 WHERE k3 = 0", silent=False)
# TupleFound (key #3)
-exec sql "replace into t21 values (2, 10, 10, 0)"
-exec sql "select * from t21 WHERE k0 = 10"
-exec sql "select * from t21 WHERE k1 = 10"
-exec sql "select * from t21 WHERE k2 = 10"
-exec sql "select * from t21 WHERE k3 = 10"
-exec sql "select * from t21 WHERE k3 = 0"
-
-exec admin "lua box.space[21]:truncate()"
+sql("replace into t21 values (2, 10, 10, 0)", silent=False)
+sql("select * from t21 WHERE k0 = 10", silent=False)
+sql("select * from t21 WHERE k1 = 10", silent=False)
+sql("select * from t21 WHERE k2 = 10", silent=False)
+sql("select * from t21 WHERE k3 = 10", silent=False)
+sql("select * from t21 WHERE k3 = 0", silent=False)
+
+admin("lua box.space[21]:truncate()", silent=False)
diff --git a/test/big/hash_multipart.test b/test/big/hash_multipart.test
index 8d4f7347a5..e987d2fffd 100644
--- a/test/big/hash_multipart.test
+++ b/test/big/hash_multipart.test
@@ -1,17 +1,17 @@
-# encoding: tarantool
+# encoding: utf-8
#
# insert rows
-exec sql "insert into t27 values (0, 'foo', 0, '', 1)"
-exec sql "insert into t27 values (0, 'foo', 1, '', 1)"
-exec sql "insert into t27 values (1, 'foo', 0, '', 2)"
-exec sql "insert into t27 values (1, 'foo', 1, '', 2)"
-exec sql "insert into t27 values (0, 'bar', 0, '', 3)"
-exec sql "insert into t27 values (0, 'bar', 1, '', 3)"
-exec sql "insert into t27 values (1, 'bar', 0, '', 4)"
-exec sql "insert into t27 values (1, 'bar', 1, '', 4)"
+sql("insert into t27 values (0, 'foo', 0, '', 1)", silent=False)
+sql("insert into t27 values (0, 'foo', 1, '', 1)", silent=False)
+sql("insert into t27 values (1, 'foo', 0, '', 2)", silent=False)
+sql("insert into t27 values (1, 'foo', 1, '', 2)", silent=False)
+sql("insert into t27 values (0, 'bar', 0, '', 3)", silent=False)
+sql("insert into t27 values (0, 'bar', 1, '', 3)", silent=False)
+sql("insert into t27 values (1, 'bar', 0, '', 4)", silent=False)
+sql("insert into t27 values (1, 'bar', 1, '', 4)", silent=False)
# try to insert a row with a duplicate key
-exec sql "insert into t27 values (1, 'bar', 1, '', 5)"
+sql("insert into t27 values (1, 'bar', 1, '', 5)", silent=False)
# output all rows
lua_code = """
@@ -24,30 +24,30 @@ function box.select_all(space)
return unpack(result)
end
"""
-exec admin "lua " + lua_code.replace('\n', ' ')
+admin("lua " + lua_code.replace('\n', ' '), silent=False)
sql.sort = True
-exec sql "call box.select_all('27')"
+sql("call box.select_all('27')", silent=False)
sql.sort = False
# primary index select
-exec admin "lua box.select(27, 0, 1, 'foo', 0)"
-exec admin "lua box.select(27, 0, 1, 'bar', 0)"
+admin("lua box.select(27, 0, 1, 'foo', 0)", silent=False)
+admin("lua box.select(27, 0, 1, 'bar', 0)", silent=False)
# primary index slect with missing part
-exec admin "lua box.select(27, 0, 1, 'foo')"
+admin("lua box.select(27, 0, 1, 'foo')", silent=False)
# primary index slect with extra part
-exec admin "lua box.select(27, 0, 1, 'foo', 0, 0)"
+admin("lua box.select(27, 0, 1, 'foo', 0, 0)", silent=False)
# primary index select with wrong type
-exec admin "lua box.select(27, 0, 1, 'foo', 'baz')"
+admin("lua box.select(27, 0, 1, 'foo', 'baz')", silent=False)
# secondary index select
-exec admin "lua box.select(27, 1, 1, 4)"
+admin("lua box.select(27, 1, 1, 4)", silent=False)
# secondary index select with no such key
-exec admin "lua box.select(27, 1, 1, 5)"
+admin("lua box.select(27, 1, 1, 5)", silent=False)
# secondary index select with missing part
-exec admin "lua box.select(27, 1, 1)"
+admin("lua box.select(27, 1, 1)", silent=False)
# secondary index select with wrong type
-exec admin "lua box.select(27, 1, 1, 'baz')"
+admin("lua box.select(27, 1, 1, 'baz')", silent=False)
# cleanup
-exec admin "lua box.space[27]:truncate()"
-exec admin "lua box.space[27]:len()"
+admin("lua box.space[27]:truncate()", silent=False)
+admin("lua box.space[27]:len()", silent=False)
diff --git a/test/big/iterator.test b/test/big/iterator.test
index 2a737ee5b4..8aa9f07ff6 100644
--- a/test/big/iterator.test
+++ b/test/big/iterator.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
#
import os
import shutil
@@ -6,103 +6,103 @@ import shutil
iterator_lua_path = os.path.join(vardir, "utils.lua")
shutil.copy("big/utils.lua", iterator_lua_path)
-exec admin "lua dofile('utils.lua')"
+admin("lua dofile('utils.lua')", silent=False)
shutil.rmtree(iterator_lua_path, True)
-exec admin "lua box.insert(20, 'pid_001', 'sid_001', 'tid_998', 'a')"
-exec admin "lua box.insert(20, 'pid_002', 'sid_001', 'tid_997', 'a')"
-exec admin "lua box.insert(20, 'pid_003', 'sid_002', 'tid_997', 'b')"
-exec admin "lua box.insert(20, 'pid_005', 'sid_002', 'tid_996', 'b')"
-exec admin "lua box.insert(20, 'pid_007', 'sid_003', 'tid_996', 'a')"
-exec admin "lua box.insert(20, 'pid_011', 'sid_004', 'tid_996', 'c')"
-exec admin "lua box.insert(20, 'pid_013', 'sid_005', 'tid_996', 'b')"
-exec admin "lua box.insert(20, 'pid_017', 'sid_006', 'tid_996', 'a')"
-exec admin "lua box.insert(20, 'pid_019', 'sid_005', 'tid_995', 'a')"
-exec admin "lua box.insert(20, 'pid_023', 'sid_005', 'tid_994', 'a')"
+admin("lua box.insert(20, 'pid_001', 'sid_001', 'tid_998', 'a')", silent=False)
+admin("lua box.insert(20, 'pid_002', 'sid_001', 'tid_997', 'a')", silent=False)
+admin("lua box.insert(20, 'pid_003', 'sid_002', 'tid_997', 'b')", silent=False)
+admin("lua box.insert(20, 'pid_005', 'sid_002', 'tid_996', 'b')", silent=False)
+admin("lua box.insert(20, 'pid_007', 'sid_003', 'tid_996', 'a')", silent=False)
+admin("lua box.insert(20, 'pid_011', 'sid_004', 'tid_996', 'c')", silent=False)
+admin("lua box.insert(20, 'pid_013', 'sid_005', 'tid_996', 'b')", silent=False)
+admin("lua box.insert(20, 'pid_017', 'sid_006', 'tid_996', 'a')", silent=False)
+admin("lua box.insert(20, 'pid_019', 'sid_005', 'tid_995', 'a')", silent=False)
+admin("lua box.insert(20, 'pid_023', 'sid_005', 'tid_994', 'a')", silent=False)
print """
#-----------------------------------------------------------------------------#
# Iterator: tree single-part unique
#-----------------------------------------------------------------------------#
"""
-exec admin "lua iterate(20, 0, 0, 1)"
-exec admin "lua iterate(20, 0, 0, 1, box.index.ALL)"
-exec admin "lua iterate(20, 0, 0, 1, box.index.EQ)"
-exec admin "lua iterate(20, 0, 0, 1, box.index.REQ)"
-exec admin "lua iterate(20, 0, 0, 1, box.index.GE)"
-exec admin "lua iterate(20, 0, 0, 1, box.index.GT)"
-exec admin "lua iterate(20, 0, 0, 1, box.index.LE)"
-exec admin "lua iterate(20, 0, 0, 1, box.index.LT)"
-exec admin "lua iterate(20, 0, 0, 1, box.index.EQ, 'pid_003')"
-exec admin "lua iterate(20, 0, 0, 1, box.index.REQ, 'pid_003')"
-exec admin "lua iterate(20, 0, 0, 1, box.index.EQ, 'pid_666')"
-exec admin "lua iterate(20, 0, 0, 1, box.index.REQ, 'pid_666')"
-exec admin "lua iterate(20, 0, 0, 1, box.index.GE, 'pid_001')"
-exec admin "lua iterate(20, 0, 0, 1, box.index.GT, 'pid_001')"
-exec admin "lua iterate(20, 0, 0, 1, box.index.GE, 'pid_999')"
-exec admin "lua iterate(20, 0, 0, 1, box.index.GT, 'pid_999')"
-exec admin "lua iterate(20, 0, 0, 1, box.index.LE, 'pid_002')"
-exec admin "lua iterate(20, 0, 0, 1, box.index.LT, 'pid_002')"
-exec admin "lua iterate(20, 0, 0, 1, box.index.LE, 'pid_000')"
-exec admin "lua iterate(20, 0, 0, 1, box.index.LT, 'pid_000')"
+admin("lua iterate(20, 0, 0, 1)", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.ALL)", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.EQ)", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.REQ)", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.GE)", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.GT)", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.LE)", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.LT)", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.EQ, 'pid_003')", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.REQ, 'pid_003')", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.EQ, 'pid_666')", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.REQ, 'pid_666')", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.GE, 'pid_001')", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.GT, 'pid_001')", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.GE, 'pid_999')", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.GT, 'pid_999')", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.LE, 'pid_002')", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.LT, 'pid_002')", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.LE, 'pid_000')", silent=False)
+admin("lua iterate(20, 0, 0, 1, box.index.LT, 'pid_000')", silent=False)
print """
#-----------------------------------------------------------------------------#
# Iterator: tree single-part non-unique
#-----------------------------------------------------------------------------#
"""
-exec admin "lua iterate(20, 1, 1, 2, box.index.ALL)"
-exec admin "lua iterate(20, 1, 1, 2, box.index.EQ)"
-exec admin "lua iterate(20, 1, 1, 2, box.index.REQ)"
-exec admin "lua iterate(20, 1, 1, 2, box.index.GE)"
-exec admin "lua iterate(20, 1, 1, 2, box.index.GT)"
-exec admin "lua iterate(20, 1, 1, 2, box.index.LE)"
-exec admin "lua iterate(20, 1, 1, 2, box.index.LT)"
-exec admin "lua iterate(20, 1, 1, 2, box.index.EQ, 'sid_005')"
-exec admin "lua iterate(20, 1, 1, 2, box.index.REQ, 'sid_005')"
-exec admin "lua iterate(20, 1, 1, 2, box.index.GE, 'sid_005')"
-exec admin "lua iterate(20, 1, 1, 2, box.index.GT, 'sid_005')"
-exec admin "lua iterate(20, 1, 1, 2, box.index.GE, 'sid_999')"
-exec admin "lua iterate(20, 1, 1, 2, box.index.GT, 'sid_999')"
-exec admin "lua iterate(20, 1, 1, 2, box.index.LE, 'sid_005')"
-exec admin "lua iterate(20, 1, 1, 2, box.index.LT, 'sid_005')"
-exec admin "lua iterate(20, 1, 1, 2, box.index.LE, 'sid_000')"
-exec admin "lua iterate(20, 1, 1, 2, box.index.LT, 'sid_000')"
+admin("lua iterate(20, 1, 1, 2, box.index.ALL)", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.EQ)", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.REQ)", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.GE)", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.GT)", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.LE)", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.LT)", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.EQ, 'sid_005')", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.REQ, 'sid_005')", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.GE, 'sid_005')", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.GT, 'sid_005')", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.GE, 'sid_999')", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.GT, 'sid_999')", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.LE, 'sid_005')", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.LT, 'sid_005')", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.LE, 'sid_000')", silent=False)
+admin("lua iterate(20, 1, 1, 2, box.index.LT, 'sid_000')", silent=False)
print """
#-----------------------------------------------------------------------------#
# Iterator: tree multi-part unique
#-----------------------------------------------------------------------------#
"""
-exec admin "lua iterate(20, 2, 1, 3, box.index.ALL)"
-exec admin "lua iterate(20, 2, 1, 3, box.index.EQ)"
-exec admin "lua iterate(20, 2, 1, 3, box.index.REQ)"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GE)"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GT)"
-exec admin "lua iterate(20, 2, 1, 3, box.index.LE)"
-exec admin "lua iterate(20, 2, 1, 3, box.index.LT)"
-exec admin "lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005', 'tid_995')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005', 'tid_999')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.REQ, 'sid_005')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.REQ, 'sid_005', 'tid_995')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.REQ, 'sid_005', 'tid_999')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GE, 'sid_005')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GT, 'sid_005')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GE, 'sid_005', 'tid_995')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GT, 'sid_005', 'tid_995')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GE, 'sid_005', 'tid_999')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GT, 'sid_005', 'tid_999')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GE, 'sid_999')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GT, 'sid_999')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.LE, 'sid_005')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.LT, 'sid_005')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.LE, 'sid_005', 'tid_997')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.LT, 'sid_005', 'tid_997')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.LE, 'sid_005', 'tid_000')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.LT, 'sid_005', 'tid_000')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.LE, 'sid_000')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.LT, 'sid_000')"
+admin("lua iterate(20, 2, 1, 3, box.index.ALL)", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.EQ)", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.REQ)", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GE)", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GT)", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.LE)", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.LT)", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005', 'tid_995')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005', 'tid_999')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.REQ, 'sid_005')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.REQ, 'sid_005', 'tid_995')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.REQ, 'sid_005', 'tid_999')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GE, 'sid_005')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GT, 'sid_005')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GE, 'sid_005', 'tid_995')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GT, 'sid_005', 'tid_995')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GE, 'sid_005', 'tid_999')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GT, 'sid_005', 'tid_999')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GE, 'sid_999')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GT, 'sid_999')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.LE, 'sid_005')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.LT, 'sid_005')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.LE, 'sid_005', 'tid_997')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.LT, 'sid_005', 'tid_997')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.LE, 'sid_005', 'tid_000')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.LT, 'sid_005', 'tid_000')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.LE, 'sid_000')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.LT, 'sid_000')", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -110,28 +110,28 @@ print """
#-----------------------------------------------------------------------------#
"""
-exec admin "lua iterate(20, 3, 2, 4, box.index.ALL)"
-exec admin "lua iterate(20, 3, 2, 4, box.index.EQ)"
-exec admin "lua iterate(20, 3, 2, 4, box.index.REQ)"
-exec admin "lua iterate(20, 3, 2, 4, box.index.GE)"
-exec admin "lua iterate(20, 3, 2, 4, box.index.GT)"
-exec admin "lua iterate(20, 3, 2, 4, box.index.LE)"
-exec admin "lua iterate(20, 3, 2, 4, box.index.LT)"
-exec admin "lua iterate(20, 3, 2, 4, box.index.EQ, 'tid_996')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.EQ, 'tid_996', 'a')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.EQ, 'tid_996', 'z')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.REQ, 'tid_996')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.REQ, 'tid_996', 'a')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.REQ, 'tid_996', '0')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.GE, 'tid_997')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.GT, 'tid_997')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.GE, 'tid_998')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.GT, 'tid_998')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.LE, 'tid_997')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.LT, 'tid_997')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.LE, 'tid_000')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.LT, 'tid_000')"
-exec admin "lua iterate(20, 3, 2, 4, box.index.LT, 'tid_996', 'to', 'many', 'keys')"
+admin("lua iterate(20, 3, 2, 4, box.index.ALL)", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.EQ)", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.REQ)", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.GE)", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.GT)", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.LE)", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.LT)", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.EQ, 'tid_996')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.EQ, 'tid_996', 'a')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.EQ, 'tid_996', 'z')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.REQ, 'tid_996')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.REQ, 'tid_996', 'a')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.REQ, 'tid_996', '0')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.GE, 'tid_997')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.GT, 'tid_997')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.GE, 'tid_998')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.GT, 'tid_998')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.LE, 'tid_997')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.LT, 'tid_997')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.LE, 'tid_000')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.LT, 'tid_000')", silent=False)
+admin("lua iterate(20, 3, 2, 4, box.index.LT, 'tid_996', 'to', 'many', 'keys')", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -139,29 +139,29 @@ print """
#-----------------------------------------------------------------------------#
"""
-exec admin "lua iterate(20, 4, 0, 1)"
-exec admin "lua iterate(20, 4, 0, 1, box.index.ALL)"
-exec admin "lua iterate(20, 4, 0, 1, box.index.EQ)"
-exec admin "lua iterate(20, 4, 0, 1, box.index.GE)"
-exec admin "lua iterate(20, 4, 0, 1, box.index.EQ, 'pid_003')"
-exec admin "lua iterate(20, 4, 0, 1, box.index.EQ, 'pid_666')"
-exec admin "lua iterate(20, 4, 0, 1, box.index.GE, 'pid_001')"
-exec admin "lua iterate(20, 4, 0, 1, box.index.GE, 'pid_999')"
+admin("lua iterate(20, 4, 0, 1)", silent=False)
+admin("lua iterate(20, 4, 0, 1, box.index.ALL)", silent=False)
+admin("lua iterate(20, 4, 0, 1, box.index.EQ)", silent=False)
+admin("lua iterate(20, 4, 0, 1, box.index.GE)", silent=False)
+admin("lua iterate(20, 4, 0, 1, box.index.EQ, 'pid_003')", silent=False)
+admin("lua iterate(20, 4, 0, 1, box.index.EQ, 'pid_666')", silent=False)
+admin("lua iterate(20, 4, 0, 1, box.index.GE, 'pid_001')", silent=False)
+admin("lua iterate(20, 4, 0, 1, box.index.GE, 'pid_999')", silent=False)
print """
#-----------------------------------------------------------------------------#
# Iterator: hash multi-part unique
#-----------------------------------------------------------------------------#
"""
-exec admin "lua iterate(20, 5, 1, 3, box.index.ALL)"
-exec admin "lua iterate(20, 5, 1, 3, box.index.EQ)"
-exec admin "lua iterate(20, 5, 1, 3, box.index.EQ, 'sid_005')"
-exec admin "lua iterate(20, 5, 1, 3, box.index.GE)"
-exec admin "lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005', 'tid_995')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005', 'tid_999')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005', 'tid_995', 'a')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GE, 'sid_005', 'tid_995')"
-exec admin "lua iterate(20, 2, 1, 3, box.index.GE, 'sid_005', 'tid_999')"
+admin("lua iterate(20, 5, 1, 3, box.index.ALL)", silent=False)
+admin("lua iterate(20, 5, 1, 3, box.index.EQ)", silent=False)
+admin("lua iterate(20, 5, 1, 3, box.index.EQ, 'sid_005')", silent=False)
+admin("lua iterate(20, 5, 1, 3, box.index.GE)", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005', 'tid_995')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005', 'tid_999')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.EQ, 'sid_005', 'tid_995', 'a')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GE, 'sid_005', 'tid_995')", silent=False)
+admin("lua iterate(20, 2, 1, 3, box.index.GE, 'sid_005', 'tid_999')", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -169,6 +169,6 @@ print """
#-----------------------------------------------------------------------------#
"""
-exec admin "lua box.space[20].index[0]:iterator(-666)"
+admin("lua box.space[20].index[0]:iterator(-666)", silent=False)
-exec admin "lua box.space[20]:truncate()"
+admin("lua box.space[20]:truncate()", silent=False)
diff --git a/test/big/lua.test b/test/big/lua.test
index 476dee6e6b..5bfce0f5e3 100644
--- a/test/big/lua.test
+++ b/test/big/lua.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
#
import os
import shutil
@@ -7,92 +7,92 @@ for file in ("index_random_test.lua",):
src_path = os.path.join("big/", file)
dst_path = os.path.join(vardir, file)
shutil.copy(src_path, dst_path)
- exec admin "lua dofile('%s')" % (file)
+ admin("lua dofile('%s')" % (file), silent=False)
os.unlink(dst_path);
-exec sql "insert into t1 values ('brave', 'new', 'world')"
-exec admin "lua box.space[1].index[1]:min()"
-exec admin "lua box.space[1].index[1]:max()"
-exec sql "call box.select('1', '1', 'new', 'world')"
+sql("insert into t1 values ('brave', 'new', 'world')", silent=False)
+admin("lua box.space[1].index[1]:min()", silent=False)
+admin("lua box.space[1].index[1]:max()", silent=False)
+sql("call box.select('1', '1', 'new', 'world')", silent=False)
print """#
# A test case for Bug #904208
# "assert failed, when key cardinality is greater than index cardinality"
# https://bugs.launchpad.net/tarantool/+bug/904208
#"""
-exec sql "call box.select('1', '1', 'new', 'world', 'order')"
-exec sql "call box.delete('1', 'brave')"
+sql("call box.select('1', '1', 'new', 'world', 'order')", silent=False)
+sql("call box.delete('1', 'brave')", silent=False)
print """#
# A test case for Bug #902091
# "Positioned iteration over a multipart index doesn't work"
# https://bugs.launchpad.net/tarantool/+bug/902091
#"""
-exec sql "insert into t1 values ('item 1', 'alabama', 'song')"
-exec admin "lua box.select(1, 1, 'alabama')"
-exec sql "insert into t1 values ('item 2', 'california', 'dreaming ')"
-exec sql "insert into t1 values ('item 3', 'california', 'uber alles')"
-exec sql "insert into t1 values ('item 4', 'georgia', 'on my mind')"
-exec admin "lua iter, tuple = box.space[1].index[1]:next('california')"
-exec admin "lua tuple"
-exec admin "lua iter, tuple = box.space[1].index[1]:next(iter)"
-exec admin "lua tuple"
-exec sql "call box.delete('1', 'item 1')"
-exec sql "call box.delete('1', 'item 2')"
-exec sql "call box.delete('1', 'item 3')"
-exec sql "call box.delete('1', 'item 4')"
+sql("insert into t1 values ('item 1', 'alabama', 'song')", silent=False)
+admin("lua box.select(1, 1, 'alabama')", silent=False)
+sql("insert into t1 values ('item 2', 'california', 'dreaming ')", silent=False)
+sql("insert into t1 values ('item 3', 'california', 'uber alles')", silent=False)
+sql("insert into t1 values ('item 4', 'georgia', 'on my mind')", silent=False)
+admin("lua iter, tuple = box.space[1].index[1]:next('california')", silent=False)
+admin("lua tuple", silent=False)
+admin("lua iter, tuple = box.space[1].index[1]:next(iter)", silent=False)
+admin("lua tuple", silent=False)
+sql("call box.delete('1', 'item 1')", silent=False)
+sql("call box.delete('1', 'item 2')", silent=False)
+sql("call box.delete('1', 'item 3')", silent=False)
+sql("call box.delete('1', 'item 4')", silent=False)
#
# Check range scan over multipart keys
#
-exec sql "insert into t5 values ('01234567', 'new', 'world')"
-exec sql "insert into t5 values ('00000000', 'of', 'puppets')"
-exec sql "insert into t5 values ('00000001', 'of', 'might', 'and', 'magic')"
-exec sql "call box.select_range(5, 1, 2, 'of')"
-exec sql "call box.select_reverse_range(5, 1, 2, 'of')"
-exec admin "lua box.space[5]:truncate()"
+sql("insert into t5 values ('01234567', 'new', 'world')", silent=False)
+sql("insert into t5 values ('00000000', 'of', 'puppets')", silent=False)
+sql("insert into t5 values ('00000001', 'of', 'might', 'and', 'magic')", silent=False)
+sql("call box.select_range(5, 1, 2, 'of')", silent=False)
+sql("call box.select_reverse_range(5, 1, 2, 'of')", silent=False)
+admin("lua box.space[5]:truncate()", silent=False)
#
# Lua 64bit numbers support
#
-exec admin "lua box.insert('8', tonumber64('18446744073709551615'), 'magic')"
-exec admin "lua tu = box.select('8', '0', tonumber64('18446744073709551615'))"
-exec admin "lua num = box.unpack('l', tu[0])"
-exec admin "lua print(num)"
-exec admin "lua type(num) == 'cdata'"
-exec admin "lua num == tonumber64('18446744073709551615')"
-exec admin "lua num = box.unpack('l', tu[0])"
-exec admin "lua num == tonumber64('18446744073709551615')"
-exec admin "lua box.delete(8, 18446744073709551615ULL)"
-exec admin "lua box.insert('8', 125ULL, 'magic')"
-exec admin "lua tu = box.select('8', '0', 125)"
-exec admin "lua tu2 = box.select('8', '0', 125LL)"
-exec admin "lua num = box.unpack('l', tu[0])"
-exec admin "lua num2 = box.unpack('l', tu2[0])"
-exec admin "lua print(num)"
-exec admin "lua print(num2)"
-exec admin "lua type(num) == 'cdata'"
-exec admin "lua type(num2) == 'cdata'"
-exec admin "lua num == tonumber64('125')"
-exec admin "lua num2 == tonumber64('125')"
-exec admin "lua box.space[8]:truncate()"
+admin("lua box.insert('8', tonumber64('18446744073709551615'), 'magic')", silent=False)
+admin("lua tu = box.select('8', '0', tonumber64('18446744073709551615'))", silent=False)
+admin("lua num = box.unpack('l', tu[0])", silent=False)
+admin("lua print(num)", silent=False)
+admin("lua type(num) == 'cdata'", silent=False)
+admin("lua num == tonumber64('18446744073709551615')", silent=False)
+admin("lua num = box.unpack('l', tu[0])", silent=False)
+admin("lua num == tonumber64('18446744073709551615')", silent=False)
+admin("lua box.delete(8, 18446744073709551615ULL)", silent=False)
+admin("lua box.insert('8', 125ULL, 'magic')", silent=False)
+admin("lua tu = box.select('8', '0', 125)", silent=False)
+admin("lua tu2 = box.select('8', '0', 125LL)", silent=False)
+admin("lua num = box.unpack('l', tu[0])", silent=False)
+admin("lua num2 = box.unpack('l', tu2[0])", silent=False)
+admin("lua print(num)", silent=False)
+admin("lua print(num2)", silent=False)
+admin("lua type(num) == 'cdata'", silent=False)
+admin("lua type(num2) == 'cdata'", silent=False)
+admin("lua num == tonumber64('125')", silent=False)
+admin("lua num2 == tonumber64('125')", silent=False)
+admin("lua box.space[8]:truncate()", silent=False)
#
# Lua select_reverse_range
#
-exec admin "lua box.insert(14, 0, 0)"
-exec admin "lua box.insert(14, 1, 0)"
-exec admin "lua box.insert(14, 2, 0)"
-exec admin "lua box.insert(14, 3, 0)"
-exec admin "lua box.insert(14, 4, 0)"
-exec admin "lua box.insert(14, 5, 0)"
-exec admin "lua box.insert(14, 6, 0)"
-exec admin "lua box.insert(14, 7, 0)"
-exec admin "lua box.insert(14, 8, 0)"
-exec admin "lua box.insert(14, 9, 0)"
-exec admin "lua box.select_range(14, 1, 10)"
-exec admin "lua box.select_reverse_range(14, 1, 10)"
-exec admin "lua box.select_reverse_range(14, 1, 4)"
-exec admin "lua box.space[14]:truncate()"
+admin("lua box.insert(14, 0, 0)", silent=False)
+admin("lua box.insert(14, 1, 0)", silent=False)
+admin("lua box.insert(14, 2, 0)", silent=False)
+admin("lua box.insert(14, 3, 0)", silent=False)
+admin("lua box.insert(14, 4, 0)", silent=False)
+admin("lua box.insert(14, 5, 0)", silent=False)
+admin("lua box.insert(14, 6, 0)", silent=False)
+admin("lua box.insert(14, 7, 0)", silent=False)
+admin("lua box.insert(14, 8, 0)", silent=False)
+admin("lua box.insert(14, 9, 0)", silent=False)
+admin("lua box.select_range(14, 1, 10)", silent=False)
+admin("lua box.select_reverse_range(14, 1, 10)", silent=False)
+admin("lua box.select_reverse_range(14, 1, 4)", silent=False)
+admin("lua box.space[14]:truncate()", silent=False)
print """
#
@@ -103,102 +103,102 @@ pid = 1
tid = 999
for sid in [1, 2]:
for i in range(1, 4):
- exec admin "lua box.insert(16, 'pid_%d', 'sid_%d', 'tid_%d')" % (pid, sid, tid)
+ admin("lua box.insert(16, 'pid_%d', 'sid_%d', 'tid_%d')" % (pid, sid, tid), silent=False)
pid += 1
tid -= 1
-exec admin "lua for k, v in box.space[16].index[1].next, box.space[16].index[1], 'sid_1' do print(v) end"
-exec admin "lua for k, v in box.space[16].index[1].prev, box.space[16].index[1], 'sid_2' do print(v) end"
-exec admin "lua for k, v in box.space[16].index[1].next_equal, box.space[16].index[1], 'sid_1' do print(v) end"
-exec admin "lua for k, v in box.space[16].index[1].prev_equal, box.space[16].index[1], 'sid_1' do print(v) end"
-exec admin "lua for k, v in box.space[16].index[1].next_equal, box.space[16].index[1], 'sid_2' do print(v) end"
-exec admin "lua for k, v in box.space[16].index[1].prev_equal, box.space[16].index[1], 'sid_2' do print(v) end"
-exec admin "lua box.space[16]:truncate()"
+admin("lua for k, v in box.space[16].index[1].next, box.space[16].index[1], 'sid_1' do print(v) end", silent=False)
+admin("lua for k, v in box.space[16].index[1].prev, box.space[16].index[1], 'sid_2' do print(v) end", silent=False)
+admin("lua for k, v in box.space[16].index[1].next_equal, box.space[16].index[1], 'sid_1' do print(v) end", silent=False)
+admin("lua for k, v in box.space[16].index[1].prev_equal, box.space[16].index[1], 'sid_1' do print(v) end", silent=False)
+admin("lua for k, v in box.space[16].index[1].next_equal, box.space[16].index[1], 'sid_2' do print(v) end", silent=False)
+admin("lua for k, v in box.space[16].index[1].prev_equal, box.space[16].index[1], 'sid_2' do print(v) end", silent=False)
+admin("lua box.space[16]:truncate()", silent=False)
#
# Tests for lua idx:count()
#
-exec admin "lua box.insert(17, 1, 1, 1)"
-exec admin "lua box.insert(17, 2, 2, 0)"
-exec admin "lua box.insert(17, 3, 2, 1)"
-exec admin "lua box.insert(17, 4, 3, 0)"
-exec admin "lua box.insert(17, 5, 3, 1)"
-exec admin "lua box.insert(17, 6, 3, 2)"
-exec admin "lua box.space[17].index[1]:count(1)"
-exec admin "lua box.space[17].index[1]:count(2)"
-exec admin "lua box.space[17].index[1]:count(2, 1)"
-exec admin "lua box.space[17].index[1]:count(2, 2)"
-exec admin "lua box.space[17].index[1]:count(3)"
-exec admin "lua box.space[17].index[1]:count(3, 3)"
-exec admin "lua box.space[17].index[1]:count()"
-exec admin "lua box.space[17]:truncate()"
+admin("lua box.insert(17, 1, 1, 1)", silent=False)
+admin("lua box.insert(17, 2, 2, 0)", silent=False)
+admin("lua box.insert(17, 3, 2, 1)", silent=False)
+admin("lua box.insert(17, 4, 3, 0)", silent=False)
+admin("lua box.insert(17, 5, 3, 1)", silent=False)
+admin("lua box.insert(17, 6, 3, 2)", silent=False)
+admin("lua box.space[17].index[1]:count(1)", silent=False)
+admin("lua box.space[17].index[1]:count(2)", silent=False)
+admin("lua box.space[17].index[1]:count(2, 1)", silent=False)
+admin("lua box.space[17].index[1]:count(2, 2)", silent=False)
+admin("lua box.space[17].index[1]:count(3)", silent=False)
+admin("lua box.space[17].index[1]:count(3, 3)", silent=False)
+admin("lua box.space[17].index[1]:count()", silent=False)
+admin("lua box.space[17]:truncate()", silent=False)
#
# Tests for lua box.auto_increment
#
-exec admin "lua box.space[18]:truncate()"
-exec admin "lua box.auto_increment(18, 'a')"
-exec admin "lua box.insert(18, 5)"
-exec admin "lua box.auto_increment(18, 'b')"
-exec admin "lua box.auto_increment(18, 'c')"
-exec admin "lua box.space[18]:truncate()"
+admin("lua box.space[18]:truncate()", silent=False)
+admin("lua box.auto_increment(18, 'a')", silent=False)
+admin("lua box.insert(18, 5)", silent=False)
+admin("lua box.auto_increment(18, 'b')", silent=False)
+admin("lua box.auto_increment(18, 'c')", silent=False)
+admin("lua box.space[18]:truncate()", silent=False)
#
# Tests for lua box.auto_increment with NUM64 keys
#
-exec admin "lua box.space[25]:truncate()"
-exec admin "lua box.auto_increment(25, 'a')"
-exec admin "lua box.insert(25, tonumber64(5))"
-exec admin "lua box.auto_increment(25, 'b')"
-exec admin "lua box.auto_increment(25, 'c')"
-exec admin "lua box.space[25]:truncate()"
+admin("lua box.space[25]:truncate()", silent=False)
+admin("lua box.auto_increment(25, 'a')", silent=False)
+admin("lua box.insert(25, tonumber64(5))", silent=False)
+admin("lua box.auto_increment(25, 'b')", silent=False)
+admin("lua box.auto_increment(25, 'c')", silent=False)
+admin("lua box.space[25]:truncate()", silent=False)
#
# Tests for lua tuple:transform()
#
-exec admin "lua t=box.insert(12, '1', '2', '3', '4', '5', '6', '7')"
-exec admin "lua t:transform(7, 0, '8', '9', '100')"
-exec admin "lua t:transform(0, 1)"
-exec admin "lua t:transform(1, 4)"
-exec admin "lua t:transform(-1, 1)"
-exec admin "lua t:transform(-3, 2)"
-exec admin "lua t:transform(0, 0, 'A')"
-exec admin "lua t:transform(-1, 0, 'A')"
-exec admin "lua t:transform(0, 1, 'A')"
-exec admin "lua t:transform(-1, 1, 'B')"
-exec admin "lua t:transform(0, 2, 'C')"
-exec admin "lua t:transform(2, 0, 'hello')"
-exec admin "lua t:transform(0, -1, 'C')"
-exec admin "lua t:transform(0, 100)"
-exec admin "lua t:transform(-100, 1)"
-exec admin "lua t:transform(0, 3, 1, 2, 3)"
-exec admin "lua t:transform(3, 1, tonumber64(4))"
-exec admin "lua t:transform(0, 1, {})"
+admin("lua t=box.insert(12, '1', '2', '3', '4', '5', '6', '7')", silent=False)
+admin("lua t:transform(7, 0, '8', '9', '100')", silent=False)
+admin("lua t:transform(0, 1)", silent=False)
+admin("lua t:transform(1, 4)", silent=False)
+admin("lua t:transform(-1, 1)", silent=False)
+admin("lua t:transform(-3, 2)", silent=False)
+admin("lua t:transform(0, 0, 'A')", silent=False)
+admin("lua t:transform(-1, 0, 'A')", silent=False)
+admin("lua t:transform(0, 1, 'A')", silent=False)
+admin("lua t:transform(-1, 1, 'B')", silent=False)
+admin("lua t:transform(0, 2, 'C')", silent=False)
+admin("lua t:transform(2, 0, 'hello')", silent=False)
+admin("lua t:transform(0, -1, 'C')", silent=False)
+admin("lua t:transform(0, 100)", silent=False)
+admin("lua t:transform(-100, 1)", silent=False)
+admin("lua t:transform(0, 3, 1, 2, 3)", silent=False)
+admin("lua t:transform(3, 1, tonumber64(4))", silent=False)
+admin("lua t:transform(0, 1, {})", silent=False)
#
# Tests for lua tuple:find() and tuple:findall()
#
-exec admin "lua t=box.insert(12, 'A', '2', '3', '4', '3', '2', '5', '6', '3', '7')"
-exec admin "lua t:find('2')"
-exec admin "lua t:find('4')"
-exec admin "lua t:find('5')"
-exec admin "lua t:find('A')"
-exec admin "lua t:find('0')"
+admin("lua t=box.insert(12, 'A', '2', '3', '4', '3', '2', '5', '6', '3', '7')", silent=False)
+admin("lua t:find('2')", silent=False)
+admin("lua t:find('4')", silent=False)
+admin("lua t:find('5')", silent=False)
+admin("lua t:find('A')", silent=False)
+admin("lua t:find('0')", silent=False)
-exec admin "lua t:findall('A')"
-exec admin "lua t:findall('2')"
-exec admin "lua t:findall('3')"
-exec admin "lua t:findall('0')"
+admin("lua t:findall('A')", silent=False)
+admin("lua t:findall('2')", silent=False)
+admin("lua t:findall('3')", silent=False)
+admin("lua t:findall('0')", silent=False)
-exec admin "lua t:find(2, '2')"
-exec admin "lua t:find(89, '2')"
-exec admin "lua t:findall(4, '3')"
+admin("lua t:find(2, '2')", silent=False)
+admin("lua t:find(89, '2')", silent=False)
+admin("lua t:findall(4, '3')", silent=False)
-exec admin "lua t=box.insert(12, 'Z', '2', 2, 3, tonumber64(2))"
-exec admin "lua t:find(2)"
-exec admin "lua t:find(tonumber64(2))"
-exec admin "lua t:find('2')"
-exec admin "lua box.space[12]:truncate()"
+admin("lua t=box.insert(12, 'Z', '2', 2, 3, tonumber64(2))", silent=False)
+admin("lua t:find(2)", silent=False)
+admin("lua t:find(tonumber64(2))", silent=False)
+admin("lua t:find('2')", silent=False)
+admin("lua box.space[12]:truncate()", silent=False)
print """#
# A test case for Bug #1038784
@@ -209,30 +209,30 @@ print """#
push_lua_path = os.path.join(vardir, "push.lua")
shutil.copy("big/push.lua", push_lua_path)
-exec admin "lua dofile('push.lua')"
+admin("lua dofile('push.lua')", silent=False)
shutil.rmtree(push_lua_path, True)
-exec admin "lua push_collection(0, 1038784, 'hello')"
-exec admin "lua push_collection(0, 1038784, 'hello')"
-exec admin "lua push_collection(0, 1038784, 'hello')"
+admin("lua push_collection(0, 1038784, 'hello')", silent=False)
+admin("lua push_collection(0, 1038784, 'hello')", silent=False)
+admin("lua push_collection(0, 1038784, 'hello')", silent=False)
-exec admin "lua push_collection(1, 1038784, 'hi')"
-exec admin "lua push_collection(2, 1038784, 'hi')"
-exec admin "lua push_collection(2, 1038784, 'hi')"
+admin("lua push_collection(1, 1038784, 'hi')", silent=False)
+admin("lua push_collection(2, 1038784, 'hi')", silent=False)
+admin("lua push_collection(2, 1038784, 'hi')", silent=False)
-exec admin "lua push_collection(5, 1038784, 'hey')"
-exec admin "lua push_collection(5, 1038784, 'hey')"
-exec admin "lua push_collection(5, 1038784, 'hey')"
-exec admin "lua push_collection(5, 1038784, 'hey')"
+admin("lua push_collection(5, 1038784, 'hey')", silent=False)
+admin("lua push_collection(5, 1038784, 'hey')", silent=False)
+admin("lua push_collection(5, 1038784, 'hey')", silent=False)
+admin("lua push_collection(5, 1038784, 'hey')", silent=False)
print """# A test case for Bug#1060967: truncation of 64-bit numbers"""
-exec admin "lua box.space[5]:insert(2^51, 'hello', 'world')"
-exec admin "lua box.space[5]:select(0, 2^51)"
-exec admin "lua box.space[5]:truncate()"
+admin("lua box.space[5]:insert(2^51, 'hello', 'world')", silent=False)
+admin("lua box.space[5]:select(0, 2^51)", silent=False)
+admin("lua box.space[5]:truncate()", silent=False)
print """# Test that we print index number in error ER_INDEX_VIOLATION"""
-exec admin "lua box.space[1]:insert(1, 'hello', 'world')"
-exec admin "lua box.space[1]:insert(2, 'hello', 'world')"
-exec admin "lua box.space[1]:truncate()"
+admin("lua box.space[1]:insert(1, 'hello', 'world')", silent=False)
+admin("lua box.space[1]:insert(2, 'hello', 'world')", silent=False)
+admin("lua box.space[1]:truncate()", silent=False)
print """#
# A test case for Bug #1042798
@@ -241,15 +241,15 @@ print """#
#"""
# Print key fields in pk
-exec admin "lua for k, f in pairs(box.space[23].index[0].key_field) do print(k, ' => ', f.fieldno) end"
-exec admin "lua box.insert(23, 1, 2, 3, 4)"
-exec admin "lua box.insert(23, 10, 20, 30, 40)"
-exec admin "lua box.insert(23, 20, 30, 40, 50)"
-exec admin "lua for _k, v in box.space[23]:pairs() do print(v) end"
+admin("lua for k, f in pairs(box.space[23].index[0].key_field) do print(k, ' => ', f.fieldno) end", silent=False)
+admin("lua box.insert(23, 1, 2, 3, 4)", silent=False)
+admin("lua box.insert(23, 10, 20, 30, 40)", silent=False)
+admin("lua box.insert(23, 20, 30, 40, 50)", silent=False)
+admin("lua for _k, v in box.space[23]:pairs() do print(v) end", silent=False)
# Truncate must not hang
-exec admin "lua box.space[23]:truncate()"
+admin("lua box.space[23]:truncate()", silent=False)
# Empty result
-exec admin "lua for _k, v in box.space[23]:pairs() do print(v) end"
+admin("lua for _k, v in box.space[23]:pairs() do print(v) end", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -257,7 +257,7 @@ print """
#-----------------------------------------------------------------------------#
""";
-exec admin "lua index_random_test(26, 0)"
+admin("lua index_random_test(26, 0)", silent=False)
print """
#-----------------------------------------------------------------------------#
@@ -265,5 +265,5 @@ print """
#-----------------------------------------------------------------------------#
""";
-exec admin "lua index_random_test(26, 1)"
+admin("lua index_random_test(26, 1)", silent=False)
diff --git a/test/big/sql.test b/test/big/sql.test
index 51b875591b..06e648c6da 100644
--- a/test/big/sql.test
+++ b/test/big/sql.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
#
sql.sort = True
@@ -8,26 +8,26 @@ print """#
# https://bugs.launchpad.net/tarantool/+bug/729758
#"""
-exec sql "insert into t0 values ('Doe', 'Richard')"
-exec sql "insert into t0 values ('Roe', 'Richard')"
-exec sql "insert into t0 values ('Woe', 'Richard')"
-exec sql "insert into t0 values ('Major', 'Tomas')"
-exec sql "insert into t0 values ('Kytes', 'Tomas')"
-exec sql "select * from t0 where k1='Richard' or k1='Tomas' or k1='Tomas' limit 5"
+sql("insert into t0 values ('Doe', 'Richard')", silent=False)
+sql("insert into t0 values ('Roe', 'Richard')", silent=False)
+sql("insert into t0 values ('Woe', 'Richard')", silent=False)
+sql("insert into t0 values ('Major', 'Tomas')", silent=False)
+sql("insert into t0 values ('Kytes', 'Tomas')", silent=False)
+sql("select * from t0 where k1='Richard' or k1='Tomas' or k1='Tomas' limit 5", silent=False)
print """#
# A test case for Bug#729879
# "Zero limit is treated the same as no limit"
# https://bugs.launchpad.net/tarantool/+bug/729879
#"""
-exec sql "select * from t0 where k1='Richard' or k1='Tomas' limit 0"
+sql("select * from t0 where k1='Richard' or k1='Tomas' limit 0", silent=False)
# Cleanup
-exec sql "delete from t0 where k0='Doe'"
-exec sql "delete from t0 where k0='Roe'"
-exec sql "delete from t0 where k0='Woe'"
-exec sql "delete from t0 where k0='Major'"
-exec sql "delete from t0 where k0='Kytes'"
+sql("delete from t0 where k0='Doe'", silent=False)
+sql("delete from t0 where k0='Roe'", silent=False)
+sql("delete from t0 where k0='Woe'", silent=False)
+sql("delete from t0 where k0='Major'", silent=False)
+sql("delete from t0 where k0='Kytes'", silent=False)
print """#
# A test case for Bug#730593
@@ -37,78 +37,78 @@ print """#
# we can't insert tuples with cardinality 1 and
# get away with it.
#"""
-exec sql "insert into t0 values ('Britney')"
-exec sql "select * from t0 where k1='Anything'"
-exec sql "insert into t0 values ('Stephanie')"
-exec sql "select * from t0 where k1='Anything'"
-exec sql "insert into t0 values ('Spears', 'Britney')"
-exec sql "select * from t0 where k0='Spears'"
-exec sql "select * from t0 where k1='Anything'"
-exec sql "select * from t0 where k1='Britney'"
-exec sql "call box.select_range('0', '0', '100', 'Spears')"
-exec sql "call box.select_range('0', '1', '100', 'Britney')"
-exec sql "delete from t0 where k0='Spears'"
+sql("insert into t0 values ('Britney')", silent=False)
+sql("select * from t0 where k1='Anything'", silent=False)
+sql("insert into t0 values ('Stephanie')", silent=False)
+sql("select * from t0 where k1='Anything'", silent=False)
+sql("insert into t0 values ('Spears', 'Britney')", silent=False)
+sql("select * from t0 where k0='Spears'", silent=False)
+sql("select * from t0 where k1='Anything'", silent=False)
+sql("select * from t0 where k1='Britney'", silent=False)
+sql("call box.select_range('0', '0', '100', 'Spears')", silent=False)
+sql("call box.select_range('0', '1', '100', 'Britney')", silent=False)
+sql("delete from t0 where k0='Spears'", silent=False)
print """#
# Test composite keys with trees
#"""
-exec sql "insert into t1 values ('key1', 'part1', 'part2')"
+sql("insert into t1 values ('key1', 'part1', 'part2')", silent=False)
# Test a duplicate insert on unique index that once resulted in a crash (bug #926080)
-exec sql "replace into t1 values ('key1', 'part1', 'part2')"
-exec sql "insert into t1 values ('key2', 'part1', 'part2_a')"
-exec sql "insert into t1 values ('key3', 'part1', 'part2_b')"
-exec admin "lua for k, v in box.space[1]:pairs() do print(v) end"
-exec sql "select * from t1 where k0='key1'"
-exec sql "select * from t1 where k0='key2'"
-exec sql "select * from t1 where k0='key3'"
-exec sql "select * from t1 where k1='part1'"
-exec sql "call box.select_range('1', '1', '100', 'part1')"
-exec sql "call box.select_range('1', '0', '100', 'key2')"
-exec sql "call box.select_range('1', '1', '100', 'part1', 'part2_a')"
+sql("replace into t1 values ('key1', 'part1', 'part2')", silent=False)
+sql("insert into t1 values ('key2', 'part1', 'part2_a')", silent=False)
+sql("insert into t1 values ('key3', 'part1', 'part2_b')", silent=False)
+admin("lua for k, v in box.space[1]:pairs() do print(v) end", silent=False)
+sql("select * from t1 where k0='key1'", silent=False)
+sql("select * from t1 where k0='key2'", silent=False)
+sql("select * from t1 where k0='key3'", silent=False)
+sql("select * from t1 where k1='part1'", silent=False)
+sql("call box.select_range('1', '1', '100', 'part1')", silent=False)
+sql("call box.select_range('1', '0', '100', 'key2')", silent=False)
+sql("call box.select_range('1', '1', '100', 'part1', 'part2_a')", silent=False)
# check non-unique multipart keys
-exec sql "insert into t5 values ('01234567', 'part1', 'part2')"
-exec sql "insert into t5 values ('11234567', 'part1', 'part2')"
-exec sql "insert into t5 values ('21234567', 'part1', 'part2_a')"
-exec sql "insert into t5 values ('31234567', 'part1_a', 'part2')"
-exec sql "insert into t5 values ('41234567', 'part1_a', 'part2_a')"
-exec admin "lua for k, v in box.space[5]:pairs() do print(v) end"
-exec sql "select * from t5 where k0='01234567'"
-exec sql "select * from t5 where k0='11234567'"
-exec sql "select * from t5 where k0='21234567'"
-exec sql "select * from t5 where k1='part1'"
-exec sql "select * from t5 where k1='part1_a'"
-exec sql "select * from t5 where k1='part_none'"
-exec sql "call box.select('5', '1', 'part1', 'part2')"
-exec sql "insert into t7 values (1, 'hello')"
-exec sql "insert into t7 values (2, 'brave')"
-exec sql "insert into t7 values (3, 'new')"
-exec sql "insert into t7 values (4, 'world')"
+sql("insert into t5 values ('01234567', 'part1', 'part2')", silent=False)
+sql("insert into t5 values ('11234567', 'part1', 'part2')", silent=False)
+sql("insert into t5 values ('21234567', 'part1', 'part2_a')", silent=False)
+sql("insert into t5 values ('31234567', 'part1_a', 'part2')", silent=False)
+sql("insert into t5 values ('41234567', 'part1_a', 'part2_a')", silent=False)
+admin("lua for k, v in box.space[5]:pairs() do print(v) end", silent=False)
+sql("select * from t5 where k0='01234567'", silent=False)
+sql("select * from t5 where k0='11234567'", silent=False)
+sql("select * from t5 where k0='21234567'", silent=False)
+sql("select * from t5 where k1='part1'", silent=False)
+sql("select * from t5 where k1='part1_a'", silent=False)
+sql("select * from t5 where k1='part_none'", silent=False)
+sql("call box.select('5', '1', 'part1', 'part2')", silent=False)
+sql("insert into t7 values (1, 'hello')", silent=False)
+sql("insert into t7 values (2, 'brave')", silent=False)
+sql("insert into t7 values (3, 'new')", silent=False)
+sql("insert into t7 values (4, 'world')", silent=False)
# Check how build_idnexes() works
server.stop()
server.start()
print """#
# Bug#929654 - secondary hash index is not built with build_indexes()
#"""
-exec sql "select * from t7 where k1='hello'"
-exec sql "select * from t7 where k1='brave'"
-exec sql "select * from t7 where k1='new'"
-exec sql "select * from t7 where k1='world'"
-exec admin "lua box.space[7]:truncate()"
-exec sql "select * from t1 where k0='key1'"
-exec sql "select * from t1 where k0='key2'"
-exec sql "select * from t1 where k0='key3'"
-exec sql "select * from t1 where k1='part1'"
-exec sql "delete from t1 where k0='key1'"
-exec sql "delete from t1 where k0='key2'"
-exec sql "delete from t1 where k0='key3'"
-exec sql "select * from t5 where k1='part1'"
-exec sql "select * from t5 where k1='part2'"
+sql("select * from t7 where k1='hello'", silent=False)
+sql("select * from t7 where k1='brave'", silent=False)
+sql("select * from t7 where k1='new'", silent=False)
+sql("select * from t7 where k1='world'", silent=False)
+admin("lua box.space[7]:truncate()", silent=False)
+sql("select * from t1 where k0='key1'", silent=False)
+sql("select * from t1 where k0='key2'", silent=False)
+sql("select * from t1 where k0='key3'", silent=False)
+sql("select * from t1 where k1='part1'", silent=False)
+sql("delete from t1 where k0='key1'", silent=False)
+sql("delete from t1 where k0='key2'", silent=False)
+sql("delete from t1 where k0='key3'", silent=False)
+sql("select * from t5 where k1='part1'", silent=False)
+sql("select * from t5 where k1='part2'", silent=False)
# cleanup
-exec sql "delete from t5 where k0='01234567'"
-exec sql "delete from t5 where k0='11234567'"
-exec sql "delete from t5 where k0='21234567'"
-exec sql "delete from t5 where k0='31234567'"
-exec sql "delete from t5 where k0='41234567'"
-exec admin "lua for k, v in box.space[5]:pairs() do print(v) end"
+sql("delete from t5 where k0='01234567'", silent=False)
+sql("delete from t5 where k0='11234567'", silent=False)
+sql("delete from t5 where k0='21234567'", silent=False)
+sql("delete from t5 where k0='31234567'", silent=False)
+sql("delete from t5 where k0='41234567'", silent=False)
+admin("lua for k, v in box.space[5]:pairs() do print(v) end", silent=False)
print """
#
@@ -118,66 +118,66 @@ print """
"""
# clean data and restart with appropriate config
-exec sql "insert into t4 values ('Spears', 'Britney')"
-exec sql "select * from t4 where k0='Spears'"
-exec sql "select * from t4 where k1='Britney'"
+sql("insert into t4 values ('Spears', 'Britney')", silent=False)
+sql("select * from t4 where k0='Spears'", silent=False)
+sql("select * from t4 where k1='Britney'", silent=False)
# try to insert the incoplete tuple
-exec sql "replace into t4 values ('Spears')"
+sql("replace into t4 values ('Spears')", silent=False)
# check that nothing has been updated
-exec sql "select * from t4 where k0='Spears'"
+sql("select * from t4 where k0='Spears'", silent=False)
# cleanup
-exec sql "delete from t4 where k0='Spears'"
+sql("delete from t4 where k0='Spears'", silent=False)
#
# Test retrieval of duplicates via a secondary key
#
-exec sql "insert into t4 values (1, 'duplicate one')"
-exec sql "insert into t4 values (2, 'duplicate one')"
-exec sql "insert into t4 values (3, 'duplicate one')"
-exec sql "insert into t4 values (4, 'duplicate one')"
-exec sql "insert into t4 values (5, 'duplicate one')"
-exec sql "insert into t4 values (6, 'duplicate two')"
-exec sql "insert into t4 values (7, 'duplicate two')"
-exec sql "insert into t4 values (8, 'duplicate two')"
-exec sql "insert into t4 values (9, 'duplicate two')"
-exec sql "insert into t4 values (10, 'duplicate two')"
-exec sql "insert into t4 values (11, 'duplicate three')"
-exec sql "insert into t4 values (12, 'duplicate three')"
-exec sql "insert into t4 values (13, 'duplicate three')"
-exec sql "insert into t4 values (14, 'duplicate three')"
-exec sql "insert into t4 values (15, 'duplicate three')"
-exec sql "select * from t4 where k1='duplicate one'"
-exec sql "select * from t4 where k1='duplicate two'"
-exec sql "select * from t4 where k1='duplicate three'"
-exec sql "delete from t4 where k0=1"
-exec sql "delete from t4 where k0=2"
-exec sql "delete from t4 where k0=3"
-exec sql "delete from t4 where k0=4"
-exec sql "delete from t4 where k0=5"
-exec sql "delete from t4 where k0=6"
-exec sql "delete from t4 where k0=7"
-exec sql "delete from t4 where k0=8"
-exec sql "delete from t4 where k0=9"
-exec sql "delete from t4 where k0=10"
-exec sql "delete from t4 where k0=11"
-exec sql "delete from t4 where k0=12"
-exec sql "delete from t4 where k0=13"
-exec sql "delete from t4 where k0=14"
-exec sql "delete from t4 where k0=15"
+sql("insert into t4 values (1, 'duplicate one')", silent=False)
+sql("insert into t4 values (2, 'duplicate one')", silent=False)
+sql("insert into t4 values (3, 'duplicate one')", silent=False)
+sql("insert into t4 values (4, 'duplicate one')", silent=False)
+sql("insert into t4 values (5, 'duplicate one')", silent=False)
+sql("insert into t4 values (6, 'duplicate two')", silent=False)
+sql("insert into t4 values (7, 'duplicate two')", silent=False)
+sql("insert into t4 values (8, 'duplicate two')", silent=False)
+sql("insert into t4 values (9, 'duplicate two')", silent=False)
+sql("insert into t4 values (10, 'duplicate two')", silent=False)
+sql("insert into t4 values (11, 'duplicate three')", silent=False)
+sql("insert into t4 values (12, 'duplicate three')", silent=False)
+sql("insert into t4 values (13, 'duplicate three')", silent=False)
+sql("insert into t4 values (14, 'duplicate three')", silent=False)
+sql("insert into t4 values (15, 'duplicate three')", silent=False)
+sql("select * from t4 where k1='duplicate one'", silent=False)
+sql("select * from t4 where k1='duplicate two'", silent=False)
+sql("select * from t4 where k1='duplicate three'", silent=False)
+sql("delete from t4 where k0=1", silent=False)
+sql("delete from t4 where k0=2", silent=False)
+sql("delete from t4 where k0=3", silent=False)
+sql("delete from t4 where k0=4", silent=False)
+sql("delete from t4 where k0=5", silent=False)
+sql("delete from t4 where k0=6", silent=False)
+sql("delete from t4 where k0=7", silent=False)
+sql("delete from t4 where k0=8", silent=False)
+sql("delete from t4 where k0=9", silent=False)
+sql("delete from t4 where k0=10", silent=False)
+sql("delete from t4 where k0=11", silent=False)
+sql("delete from t4 where k0=12", silent=False)
+sql("delete from t4 where k0=13", silent=False)
+sql("delete from t4 where k0=14", silent=False)
+sql("delete from t4 where k0=15", silent=False)
#
# Check min() and max() functions
#
-exec sql "insert into t4 values(1, 'Aardvark ')"
-exec sql "insert into t4 values(2, 'Bilimbi')"
-exec sql "insert into t4 values(3, 'Creature ')"
-exec admin "lua for k, v in box.space[4]:pairs() do print(v) end"
-exec admin "lua box.space[4].index[0].idx:min()"
-exec admin "lua box.space[4].index[0].idx:max()"
-exec admin "lua box.space[4].index[1].idx:min()"
-exec admin "lua box.space[4].index[1].idx:max()"
-exec sql "delete from t4 where k0=1"
-exec sql "delete from t4 where k0=2"
-exec sql "delete from t4 where k0=3"
+sql("insert into t4 values(1, 'Aardvark ')", silent=False)
+sql("insert into t4 values(2, 'Bilimbi')", silent=False)
+sql("insert into t4 values(3, 'Creature ')", silent=False)
+admin("lua for k, v in box.space[4]:pairs() do print(v) end", silent=False)
+admin("lua box.space[4].index[0].idx:min()", silent=False)
+admin("lua box.space[4].index[0].idx:max()", silent=False)
+admin("lua box.space[4].index[1].idx:min()", silent=False)
+admin("lua box.space[4].index[1].idx:max()", silent=False)
+sql("delete from t4 where k0=1", silent=False)
+sql("delete from t4 where k0=2", silent=False)
+sql("delete from t4 where k0=3", silent=False)
sql.sort = False
# vim: syntax=python
diff --git a/test/big/tree_pk.test b/test/big/tree_pk.test
index 7ba2387e56..db8081c348 100644
--- a/test/big/tree_pk.test
+++ b/test/big/tree_pk.test
@@ -1,44 +1,44 @@
-# encoding: tarantool
+# encoding: utf-8
#
# integer keys
-exec sql "insert into t2 values (1, 'tuple')"
-exec admin "save snapshot"
-exec sql "insert into t2 values (2, 'tuple 2')"
-exec admin "save snapshot"
+sql("insert into t2 values (1, 'tuple')", silent=False)
+admin("save snapshot", silent=False)
+sql("insert into t2 values (2, 'tuple 2')", silent=False)
+admin("save snapshot", silent=False)
-exec sql "insert into t2 values (3, 'tuple 3')"
-exec sql "select * from t2 where k0 = 1"
-exec sql "select * from t2 where k0 = 2"
-exec sql "select * from t2 where k0 = 3"
+sql("insert into t2 values (3, 'tuple 3')", silent=False)
+sql("select * from t2 where k0 = 1", silent=False)
+sql("select * from t2 where k0 = 2", silent=False)
+sql("select * from t2 where k0 = 3", silent=False)
# Cleanup
-exec sql "delete from t2 where k0 = 1"
-exec sql "delete from t2 where k0 = 2"
-exec sql "delete from t2 where k0 = 3"
+sql("delete from t2 where k0 = 1", silent=False)
+sql("delete from t2 where k0 = 2", silent=False)
+sql("delete from t2 where k0 = 3", silent=False)
# Test incorrect keys - supplied key field type does not match index type
# https://bugs.launchpad.net/tarantool/+bug/1072624
-exec sql "insert into t2 VALUES('xxxxxxx')"
-exec sql "insert into t2 VALUES('')"
-exec sql "insert into t2 VALUES('12')"
+sql("insert into t2 VALUES('xxxxxxx')", silent=False)
+sql("insert into t2 VALUES('')", silent=False)
+sql("insert into t2 VALUES('12')", silent=False)
# string keys
-exec sql "insert into t3 values ('identifier', 'tuple')"
-exec admin "save snapshot"
-exec sql "insert into t3 values ('second', 'tuple 2')"
-exec admin "save snapshot"
-exec sql "call box.select_range('3', '0', '100', 'second')"
-exec sql "call box.select_range('3', '0', '100', 'identifier')"
-
-exec sql "insert into t3 values ('third', 'tuple 3')"
-exec sql "select * from t3 where k0 = 'identifier'"
-exec sql "select * from t3 where k0 = 'second'"
-exec sql "select * from t3 where k0 = 'third'"
+sql("insert into t3 values ('identifier', 'tuple')", silent=False)
+admin("save snapshot", silent=False)
+sql("insert into t3 values ('second', 'tuple 2')", silent=False)
+admin("save snapshot", silent=False)
+sql("call box.select_range('3', '0', '100', 'second')", silent=False)
+sql("call box.select_range('3', '0', '100', 'identifier')", silent=False)
+
+sql("insert into t3 values ('third', 'tuple 3')", silent=False)
+sql("select * from t3 where k0 = 'identifier'", silent=False)
+sql("select * from t3 where k0 = 'second'", silent=False)
+sql("select * from t3 where k0 = 'third'", silent=False)
# Cleanup
-exec sql "delete from t3 where k0 = 'identifier'"
-exec sql "delete from t3 where k0 = 'second'"
-exec sql "delete from t3 where k0 = 'third'"
+sql("delete from t3 where k0 = 'identifier'", silent=False)
+sql("delete from t3 where k0 = 'second'", silent=False)
+sql("delete from t3 where k0 = 'third'", silent=False)
lua = """
function box.crossjoin(space0, space1, limit)
space0 = tonumber(space0)
@@ -58,124 +58,124 @@ function box.crossjoin(space0, space1, limit)
end
return unpack(result)
end"""
-exec sql "insert into t2 values (1, 'tuple')"
-exec sql "insert into t3 values (1, 'tuple')"
-exec sql "insert into t3 values (2, 'tuple')"
-exec admin "lua " + lua.replace('\n', ' ')
-exec sql "call box.crossjoin('3', '3', '0')"
-exec sql "call box.crossjoin('3', '3', '5')"
-exec sql "call box.crossjoin('3', '3', '10000')"
-exec sql "call box.crossjoin('3', '2', '10000')"
-exec admin "lua box.space[3]:truncate()"
+sql("insert into t2 values (1, 'tuple')", silent=False)
+sql("insert into t3 values (1, 'tuple')", silent=False)
+sql("insert into t3 values (2, 'tuple')", silent=False)
+admin("lua "+ lua.replace('\n', ' '), silent=False)
+sql("call box.crossjoin('3', '3', '0')", silent=False)
+sql("call box.crossjoin('3', '3', '5')", silent=False)
+sql("call box.crossjoin('3', '3', '10000')", silent=False)
+sql("call box.crossjoin('3', '2', '10000')", silent=False)
+admin("lua box.space[3]:truncate()", silent=False)
# Bug #922520 - select missing keys
-exec sql "insert into t2 values (200, 'select me!')"
-exec sql "select * from t2 where k0 = 200"
-exec sql "select * from t2 where k0 = 199"
-exec sql "select * from t2 where k0 = 201"
+sql("insert into t2 values (200, 'select me!')", silent=False)
+sql("select * from t2 where k0 = 200", silent=False)
+sql("select * from t2 where k0 = 199", silent=False)
+sql("select * from t2 where k0 = 201", silent=False)
# Test partially specified keys in TREE indexes
-exec sql "insert into t15 values ('abcd')"
-exec sql "insert into t15 values ('abcda')"
-exec sql "insert into t15 values ('abcda_')"
-exec sql "insert into t15 values ('abcdb')"
-exec sql "insert into t15 values ('abcdb_')"
-exec sql "insert into t15 values ('abcdb__')"
-exec sql "insert into t15 values ('abcdb___')"
-exec sql "insert into t15 values ('abcdc')"
-exec sql "insert into t15 values ('abcdc_')"
-exec admin "lua box.space[15].index[0]:select_range(3, 'abcdb')"
-exec admin "lua box.space[15]:truncate()"
+sql("insert into t15 values ('abcd')", silent=False)
+sql("insert into t15 values ('abcda')", silent=False)
+sql("insert into t15 values ('abcda_')", silent=False)
+sql("insert into t15 values ('abcdb')", silent=False)
+sql("insert into t15 values ('abcdb_')", silent=False)
+sql("insert into t15 values ('abcdb__')", silent=False)
+sql("insert into t15 values ('abcdb___')", silent=False)
+sql("insert into t15 values ('abcdc')", silent=False)
+sql("insert into t15 values ('abcdc_')", silent=False)
+admin("lua box.space[15].index[0]:select_range(3, 'abcdb')", silent=False)
+admin("lua box.space[15]:truncate()", silent=False)
#
# tree::replace tests
#
-exec admin "lua box.space[22]:truncate()"
+admin("lua box.space[22]:truncate()", silent=False)
-exec sql "insert into t22 values (0, 0, 0, 0)"
-exec sql "insert into t22 values (1, 1, 1, 1)"
-exec sql "insert into t22 values (2, 2, 2, 2)"
+sql("insert into t22 values (0, 0, 0, 0)", silent=False)
+sql("insert into t22 values (1, 1, 1, 1)", silent=False)
+sql("insert into t22 values (2, 2, 2, 2)", silent=False)
# OK
-exec sql "replace into t22 values (1, 1, 1, 1)"
-exec sql "replace into t22 values (1, 10, 10, 10)"
-exec sql "replace into t22 values (1, 1, 1, 1)"
-exec sql "select * from t22 WHERE k0 = 10"
-exec sql "select * from t22 WHERE k1 = 10"
-exec sql "select * from t22 WHERE k2 = 10"
-exec sql "select * from t22 WHERE k3 = 10"
-exec sql "select * from t22 WHERE k0 = 1"
-exec sql "select * from t22 WHERE k1 = 1"
-exec sql "select * from t22 WHERE k2 = 1"
-exec sql "select * from t22 WHERE k3 = 1"
+sql("replace into t22 values (1, 1, 1, 1)", silent=False)
+sql("replace into t22 values (1, 10, 10, 10)", silent=False)
+sql("replace into t22 values (1, 1, 1, 1)", silent=False)
+sql("select * from t22 WHERE k0 = 10", silent=False)
+sql("select * from t22 WHERE k1 = 10", silent=False)
+sql("select * from t22 WHERE k2 = 10", silent=False)
+sql("select * from t22 WHERE k3 = 10", silent=False)
+sql("select * from t22 WHERE k0 = 1", silent=False)
+sql("select * from t22 WHERE k1 = 1", silent=False)
+sql("select * from t22 WHERE k2 = 1", silent=False)
+sql("select * from t22 WHERE k3 = 1", silent=False)
# OK
-exec sql "insert into t22 values (10, 10, 10, 10)"
-exec sql "delete from t22 WHERE k0 = 10"
-exec sql "select * from t22 WHERE k0 = 10"
-exec sql "select * from t22 WHERE k1 = 10"
-exec sql "select * from t22 WHERE k2 = 10"
-exec sql "select * from t22 WHERE k3 = 10"
+sql("insert into t22 values (10, 10, 10, 10)", silent=False)
+sql("delete from t22 WHERE k0 = 10", silent=False)
+sql("select * from t22 WHERE k0 = 10", silent=False)
+sql("select * from t22 WHERE k1 = 10", silent=False)
+sql("select * from t22 WHERE k2 = 10", silent=False)
+sql("select * from t22 WHERE k3 = 10", silent=False)
# TupleFound (primary key)
-exec sql "insert into t22 values (1, 10, 10, 10)"
-exec sql "select * from t22 WHERE k0 = 10"
-exec sql "select * from t22 WHERE k1 = 10"
-exec sql "select * from t22 WHERE k2 = 10"
-exec sql "select * from t22 WHERE k3 = 10"
-exec sql "select * from t22 WHERE k0 = 1"
+sql("insert into t22 values (1, 10, 10, 10)", silent=False)
+sql("select * from t22 WHERE k0 = 10", silent=False)
+sql("select * from t22 WHERE k1 = 10", silent=False)
+sql("select * from t22 WHERE k2 = 10", silent=False)
+sql("select * from t22 WHERE k3 = 10", silent=False)
+sql("select * from t22 WHERE k0 = 1", silent=False)
# TupleNotFound (primary key)
-exec sql "replace into t22 values (10, 10, 10, 10)"
-exec sql "select * from t22 WHERE k0 = 10"
-exec sql "select * from t22 WHERE k1 = 10"
-exec sql "select * from t22 WHERE k2 = 10"
-exec sql "select * from t22 WHERE k3 = 10"
+sql("replace into t22 values (10, 10, 10, 10)", silent=False)
+sql("select * from t22 WHERE k0 = 10", silent=False)
+sql("select * from t22 WHERE k1 = 10", silent=False)
+sql("select * from t22 WHERE k2 = 10", silent=False)
+sql("select * from t22 WHERE k3 = 10", silent=False)
# TupleFound (key #1)
-exec sql "insert into t22 values (10, 0, 10, 10)"
-exec sql "select * from t22 WHERE k0 = 10"
-exec sql "select * from t22 WHERE k1 = 10"
-exec sql "select * from t22 WHERE k2 = 10"
-exec sql "select * from t22 WHERE k3 = 10"
-exec sql "select * from t22 WHERE k1 = 0"
+sql("insert into t22 values (10, 0, 10, 10)", silent=False)
+sql("select * from t22 WHERE k0 = 10", silent=False)
+sql("select * from t22 WHERE k1 = 10", silent=False)
+sql("select * from t22 WHERE k2 = 10", silent=False)
+sql("select * from t22 WHERE k3 = 10", silent=False)
+sql("select * from t22 WHERE k1 = 0", silent=False)
# TupleFound (key #1)
-exec sql "replace into t22 values (2, 0, 10, 10)"
-exec sql "select * from t22 WHERE k0 = 10"
-exec sql "select * from t22 WHERE k1 = 10"
-exec sql "select * from t22 WHERE k2 = 10"
-exec sql "select * from t22 WHERE k3 = 10"
-exec sql "select * from t22 WHERE k1 = 0"
+sql("replace into t22 values (2, 0, 10, 10)", silent=False)
+sql("select * from t22 WHERE k0 = 10", silent=False)
+sql("select * from t22 WHERE k1 = 10", silent=False)
+sql("select * from t22 WHERE k2 = 10", silent=False)
+sql("select * from t22 WHERE k3 = 10", silent=False)
+sql("select * from t22 WHERE k1 = 0", silent=False)
# TupleFound (key #3)
-exec sql "insert into t22 values (10, 10, 10, 0)"
-exec sql "select * from t22 WHERE k0 = 10"
-exec sql "select * from t22 WHERE k1 = 10"
-exec sql "select * from t22 WHERE k2 = 10"
-exec sql "select * from t22 WHERE k3 = 10"
-exec sql "select * from t22 WHERE k3 = 0"
+sql("insert into t22 values (10, 10, 10, 0)", silent=False)
+sql("select * from t22 WHERE k0 = 10", silent=False)
+sql("select * from t22 WHERE k1 = 10", silent=False)
+sql("select * from t22 WHERE k2 = 10", silent=False)
+sql("select * from t22 WHERE k3 = 10", silent=False)
+sql("select * from t22 WHERE k3 = 0", silent=False)
# TupleFound (key #3)
-exec sql "replace into t22 values (2, 10, 10, 0)"
-exec sql "select * from t22 WHERE k0 = 10"
-exec sql "select * from t22 WHERE k1 = 10"
-exec sql "select * from t22 WHERE k2 = 10"
-exec sql "select * from t22 WHERE k3 = 10"
-exec sql "select * from t22 WHERE k3 = 0"
+sql("replace into t22 values (2, 10, 10, 0)", silent=False)
+sql("select * from t22 WHERE k0 = 10", silent=False)
+sql("select * from t22 WHERE k1 = 10", silent=False)
+sql("select * from t22 WHERE k2 = 10", silent=False)
+sql("select * from t22 WHERE k3 = 10", silent=False)
+sql("select * from t22 WHERE k3 = 0", silent=False)
sql.sort = True
# Non-Uniq test (key #2)
-exec sql "insert into t22 values (4, 4, 0, 4)"
-exec sql "insert into t22 values (5, 5, 0, 5)"
-exec sql "insert into t22 values (6, 6, 0, 6)"
-exec sql "replace into t22 values (5, 5, 0, 5)"
-exec sql "select * from t22 WHERE k2 = 0"
-exec sql "delete from t22 WHERE k0 = 5"
-exec sql "select * from t22 WHERE k2 = 0"
+sql("insert into t22 values (4, 4, 0, 4)", silent=False)
+sql("insert into t22 values (5, 5, 0, 5)", silent=False)
+sql("insert into t22 values (6, 6, 0, 6)", silent=False)
+sql("replace into t22 values (5, 5, 0, 5)", silent=False)
+sql("select * from t22 WHERE k2 = 0", silent=False)
+sql("delete from t22 WHERE k0 = 5", silent=False)
+sql("select * from t22 WHERE k2 = 0", silent=False)
sql.sort = False
-exec admin "lua box.space[22]:truncate()"
+admin("lua box.space[22]:truncate()", silent=False)
diff --git a/test/big/tree_pk_multipart.test b/test/big/tree_pk_multipart.test
index d503bf069b..2a078a5c40 100644
--- a/test/big/tree_pk_multipart.test
+++ b/test/big/tree_pk_multipart.test
@@ -1,145 +1,145 @@
-# encoding: tarantool
+# encoding: utf-8
#
#
# Insert test
#
-exec sql "insert into t9 values ('Vincent', 'Jules', 0, 'Do you know what they call a - a - a Quarter Pounder with cheese in Paris?')"
-exec sql "insert into t9 values ('Jules', 'Vincent', 0, 'They don`t call it a Quarter Pounder with cheese?')"
-exec sql "insert into t9 values ('Vincent', 'Jules', 1, 'No man, they got the metric system. They wouldn`t know what the f--k a Quarter Pounder is.')"
-exec sql "insert into t9 values ('Jules', 'Vincent', 1, 'Then what do they call it?')"
-exec sql "insert into t9 values ('Vincent', 'Jules', 2, 'They call it a `Royale` with cheese.')"
-exec sql "insert into t9 values ('Jules', 'Vincent', 2, 'A `Royale` with cheese!')"
-exec sql "insert into t9 values ('Vincent', 'Jules', 3, 'That`s right.')"
-exec sql "insert into t9 values ('Jules', 'Vincent', 3, 'What do they call a Big Mac?')"
-exec sql "insert into t9 values ('Vincent', 'Jules', 4, 'A Big Mac`s a Big Mac, but they call it `Le Big Mac.`')"
-exec sql "insert into t9 values ('Jules', 'Vincent', 4, '`Le Big Mac!`')"
-exec sql "insert into t9 values ('Vincent', 'Jules', 5, 'Ha, ha, ha.')"
-exec sql "insert into t9 values ('Jules', 'Vincent', 5, 'What do they call a `Whopper`?')"
-exec sql "insert into t9 values ('Vincent', 'Jules', 6, 'I dunno, I didn`t go into Burger King.')"
-
-exec sql "insert into t9 values ('The Wolf!', 'Vincent', 0, 'Jimmie, lead the way. Boys, get to work.')"
-exec sql "insert into t9 values ('Vincent', 'The Wolf!', 0, 'A please would be nice.')"
-exec sql "insert into t9 values ('The Wolf!', 'Vincent', 1, 'Come again?')"
-exec sql "insert into t9 values ('Vincent', 'The Wolf!', 1, 'I said a please would be nice.')"
-exec sql "insert into t9 values ('The Wolf!', 'Vincent', 2, 'Get it straight buster - I`m not here to say please, I`m here to tell you what to do and if self-preservation is an instinct you possess you`d better fucking do it and do it quick. I`m here to help - if my help`s not appreciated then lotsa luck, gentlemen.')"
-exec sql "insert into t9 values ('The Wolf!', 'Vincent', 3, 'I don`t mean any disrespect, I just don`t like people barking orders at me.')"
-exec sql "insert into t9 values ('Vincent', 'The Wolf!', 2, 'If I`m curt with you it`s because time is a factor. I think fast, I talk fast and I need you guys to act fast if you wanna get out of this. So, pretty please... with sugar on top. Clean the fucking car.')"
+sql("insert into t9 values ('Vincent', 'Jules', 0, 'Do you know what they call a - a - a Quarter Pounder with cheese in Paris?')", silent=False)
+sql("insert into t9 values ('Jules', 'Vincent', 0, 'They don`t call it a Quarter Pounder with cheese?')", silent=False)
+sql("insert into t9 values ('Vincent', 'Jules', 1, 'No man, they got the metric system. They wouldn`t know what the f--k a Quarter Pounder is.')", silent=False)
+sql("insert into t9 values ('Jules', 'Vincent', 1, 'Then what do they call it?')", silent=False)
+sql("insert into t9 values ('Vincent', 'Jules', 2, 'They call it a `Royale` with cheese.')", silent=False)
+sql("insert into t9 values ('Jules', 'Vincent', 2, 'A `Royale` with cheese!')", silent=False)
+sql("insert into t9 values ('Vincent', 'Jules', 3, 'That`s right.')", silent=False)
+sql("insert into t9 values ('Jules', 'Vincent', 3, 'What do they call a Big Mac?')", silent=False)
+sql("insert into t9 values ('Vincent', 'Jules', 4, 'A Big Mac`s a Big Mac, but they call it `Le Big Mac.`')", silent=False)
+sql("insert into t9 values ('Jules', 'Vincent', 4, '`Le Big Mac!`')", silent=False)
+sql("insert into t9 values ('Vincent', 'Jules', 5, 'Ha, ha, ha.')", silent=False)
+sql("insert into t9 values ('Jules', 'Vincent', 5, 'What do they call a `Whopper`?')", silent=False)
+sql("insert into t9 values ('Vincent', 'Jules', 6, 'I dunno, I didn`t go into Burger King.')", silent=False)
+
+sql("insert into t9 values ('The Wolf!', 'Vincent', 0, 'Jimmie, lead the way. Boys, get to work.')", silent=False)
+sql("insert into t9 values ('Vincent', 'The Wolf!', 0, 'A please would be nice.')", silent=False)
+sql("insert into t9 values ('The Wolf!', 'Vincent', 1, 'Come again?')", silent=False)
+sql("insert into t9 values ('Vincent', 'The Wolf!', 1, 'I said a please would be nice.')", silent=False)
+sql("insert into t9 values ('The Wolf!', 'Vincent', 2, 'Get it straight buster - I`m not here to say please, I`m here to tell you what to do and if self-preservation is an instinct you possess you`d better fucking do it and do it quick. I`m here to help - if my help`s not appreciated then lotsa luck, gentlemen.')", silent=False)
+sql("insert into t9 values ('The Wolf!', 'Vincent', 3, 'I don`t mean any disrespect, I just don`t like people barking orders at me.')", silent=False)
+sql("insert into t9 values ('Vincent', 'The Wolf!', 2, 'If I`m curt with you it`s because time is a factor. I think fast, I talk fast and I need you guys to act fast if you wanna get out of this. So, pretty please... with sugar on top. Clean the fucking car.')", silent=False)
#
# Select test
#
# Select by one entry
-exec admin "lua box.select(9, 0, 'Vincent', 'Jules', 0)"
-exec admin "lua box.select(9, 0, 'Jules', 'Vincent', 0)"
-exec admin "lua box.select(9, 0, 'Vincent', 'Jules', 1)"
-exec admin "lua box.select(9, 0, 'Jules', 'Vincent', 1)"
-exec admin "lua box.select(9, 0, 'Vincent', 'Jules', 2)"
-exec admin "lua box.select(9, 0, 'Jules', 'Vincent', 2)"
-exec admin "lua box.select(9, 0, 'Vincent', 'Jules', 3)"
-exec admin "lua box.select(9, 0, 'Jules', 'Vincent', 3)"
-exec admin "lua box.select(9, 0, 'Vincent', 'Jules', 4)"
-exec admin "lua box.select(9, 0, 'Jules', 'Vincent', 4)"
-exec admin "lua box.select(9, 0, 'Vincent', 'Jules', 5)"
-exec admin "lua box.select(9, 0, 'Jules', 'Vincent', 5)"
-exec admin "lua box.select(9, 0, 'Vincent', 'Jules', 6)"
-
-exec admin "lua box.select(9, 0, 'The Wolf!', 'Vincent', 0)"
-exec admin "lua box.select(9, 0, 'Vincent', 'The Wolf!', 0)"
-exec admin "lua box.select(9, 0, 'The Wolf!', 'Vincent', 1)"
-exec admin "lua box.select(9, 0, 'Vincent', 'The Wolf!', 1)"
-exec admin "lua box.select(9, 0, 'The Wolf!', 'Vincent', 2)"
-exec admin "lua box.select(9, 0, 'The Wolf!', 'Vincent', 3)"
-exec admin "lua box.select(9, 0, 'Vincent', 'The Wolf!', 2)"
+admin("lua box.select(9, 0, 'Vincent', 'Jules', 0)", silent=False)
+admin("lua box.select(9, 0, 'Jules', 'Vincent', 0)", silent=False)
+admin("lua box.select(9, 0, 'Vincent', 'Jules', 1)", silent=False)
+admin("lua box.select(9, 0, 'Jules', 'Vincent', 1)", silent=False)
+admin("lua box.select(9, 0, 'Vincent', 'Jules', 2)", silent=False)
+admin("lua box.select(9, 0, 'Jules', 'Vincent', 2)", silent=False)
+admin("lua box.select(9, 0, 'Vincent', 'Jules', 3)", silent=False)
+admin("lua box.select(9, 0, 'Jules', 'Vincent', 3)", silent=False)
+admin("lua box.select(9, 0, 'Vincent', 'Jules', 4)", silent=False)
+admin("lua box.select(9, 0, 'Jules', 'Vincent', 4)", silent=False)
+admin("lua box.select(9, 0, 'Vincent', 'Jules', 5)", silent=False)
+admin("lua box.select(9, 0, 'Jules', 'Vincent', 5)", silent=False)
+admin("lua box.select(9, 0, 'Vincent', 'Jules', 6)", silent=False)
+
+admin("lua box.select(9, 0, 'The Wolf!', 'Vincent', 0)", silent=False)
+admin("lua box.select(9, 0, 'Vincent', 'The Wolf!', 0)", silent=False)
+admin("lua box.select(9, 0, 'The Wolf!', 'Vincent', 1)", silent=False)
+admin("lua box.select(9, 0, 'Vincent', 'The Wolf!', 1)", silent=False)
+admin("lua box.select(9, 0, 'The Wolf!', 'Vincent', 2)", silent=False)
+admin("lua box.select(9, 0, 'The Wolf!', 'Vincent', 3)", silent=False)
+admin("lua box.select(9, 0, 'Vincent', 'The Wolf!', 2)", silent=False)
# Select all messages from Vincent to Jules
-exec admin "lua box.select(9, 0, 'Vincent', 'Jules')"
+admin("lua box.select(9, 0, 'Vincent', 'Jules')", silent=False)
# Select all messages from Jules to Vincent
-exec admin "lua box.select(9, 0, 'Jules', 'Vincent')"
+admin("lua box.select(9, 0, 'Jules', 'Vincent')", silent=False)
# Select all messages from Vincent to The Wolf
-exec admin "lua box.select(9, 0, 'Vincent', 'The Wolf!')"
+admin("lua box.select(9, 0, 'Vincent', 'The Wolf!')", silent=False)
# Select all messages from The Wolf to Vincent
-exec admin "lua box.select(9, 0, 'The Wolf!', 'Vincent')"
+admin("lua box.select(9, 0, 'The Wolf!', 'Vincent')", silent=False)
# Select all Vincent messages
-exec admin "lua box.select(9, 0, 'Vincent')"
+admin("lua box.select(9, 0, 'Vincent')", silent=False)
#
# Delete test
#
# Delete some messages from the The Wolf and Vincent dialog
-exec admin "lua box.delete(9, 'The Wolf!', 'Vincent', 0)"
-exec admin "lua box.delete(9, 'The Wolf!', 'Vincent', 3)"
-exec admin "lua box.delete(9, 'Vincent', 'The Wolf!', 0)"
+admin("lua box.delete(9, 'The Wolf!', 'Vincent', 0)", silent=False)
+admin("lua box.delete(9, 'The Wolf!', 'Vincent', 3)", silent=False)
+admin("lua box.delete(9, 'Vincent', 'The Wolf!', 0)", silent=False)
-exec admin "lua box.update(9, {'Vincent', 'The Wolf!', 1}, '=p=p', 0, 'Updated', 4, 'New')"
-exec admin "lua box.update(9, {'Updated', 'The Wolf!', 1}, '=p#p', 0, 'Vincent', 4, '')"
+admin("lua box.update(9, {'Vincent', 'The Wolf!', 1}, '=p=p', 0, 'Updated', 4, 'New')", silent=False)
+admin("lua box.update(9, {'Updated', 'The Wolf!', 1}, '=p#p', 0, 'Vincent', 4, '')", silent=False)
# Checking Vincent's last messages
-exec admin "lua box.select(9, 0, 'Vincent', 'The Wolf!')"
+admin("lua box.select(9, 0, 'Vincent', 'The Wolf!')", silent=False)
# Checking The Wolf's last messages
-exec admin "lua box.select(9, 0, 'The Wolf!', 'Vincent')"
+admin("lua box.select(9, 0, 'The Wolf!', 'Vincent')", silent=False)
# try to delete nonexistent message
-exec admin "lua box.delete(9, 'Vincent', 'The Wolf!', 3)"
+admin("lua box.delete(9, 'Vincent', 'The Wolf!', 3)", silent=False)
# try to delete patrial defined key
-exec admin "lua box.delete(9, 'Vincent', 'The Wolf!')"
+admin("lua box.delete(9, 'Vincent', 'The Wolf!')", silent=False)
# try to delete by invalid key
-exec admin "lua box.delete(9, 'The Wolf!', 'Vincent', 1, 'Come again?')"
+admin("lua box.delete(9, 'The Wolf!', 'Vincent', 1, 'Come again?')", silent=False)
#
# Update test
#
-exec admin "lua box.update(9, {'The Wolf!', 'Vincent', 1}, '=p', 3, '<ooops>')"
-exec admin "lua box.update(9, {'Vincent', 'The Wolf!', 1}, '=p', 3, '<ooops>')"
+admin("lua box.update(9, {'The Wolf!', 'Vincent', 1}, '=p', 3, '<ooops>')", silent=False)
+admin("lua box.update(9, {'Vincent', 'The Wolf!', 1}, '=p', 3, '<ooops>')", silent=False)
# Checking Vincent's last messages
-exec admin "lua box.select(9, 0, 'Vincent', 'The Wolf!')"
+admin("lua box.select(9, 0, 'Vincent', 'The Wolf!')", silent=False)
# Checking The Wolf's last messages
-exec admin "lua box.select(9, 0, 'The Wolf!', 'Vincent')"
+admin("lua box.select(9, 0, 'The Wolf!', 'Vincent')", silent=False)
# try to update a nonexistent message
-exec admin "lua box.update(9, {'Vincent', 'The Wolf!', 3}, '=p', 3, '<ooops>')"
+admin("lua box.update(9, {'Vincent', 'The Wolf!', 3}, '=p', 3, '<ooops>')", silent=False)
# try to update patrial defined key
-exec admin "lua box.update(9, {'Vincent', 'The Wolf!'}, '=p', 3, '<ooops>')"
+admin("lua box.update(9, {'Vincent', 'The Wolf!'}, '=p', 3, '<ooops>')", silent=False)
# try to update by invalid key
-exec admin "lua box.update(9, {'The Wolf!', 'Vincent', 1, 'Come again?'}, '=p', 3, '<ooops>')"
-exec admin "lua box.space[9]:len()"
-exec admin "lua box.space[9]:truncate()"
-exec admin "lua box.space[9]:len()"
+admin("lua box.update(9, {'The Wolf!', 'Vincent', 1, 'Come again?'}, '=p', 3, '<ooops>')", silent=False)
+admin("lua box.space[9]:len()", silent=False)
+admin("lua box.space[9]:truncate()", silent=False)
+admin("lua box.space[9]:len()", silent=False)
print """ A test case for Bug#1051006 Tree iterators return garbage
if an index is modified between calls"""
-exec admin "lua box.space[16]:insert('a', 'a', 'a')"
-exec admin "lua box.space[16]:insert('d', 'd', 'd')"
-exec admin "lua box.space[16]:insert('e', 'e', 'e')"
-exec admin "lua box.space[16]:insert('b', 'b', 'b')"
-exec admin "lua box.space[16]:insert('c', 'c', 'c')"
-exec admin "lua k,v = box.space[16].index[1]:next(k)"
-exec admin "lua print(v)"
-exec admin "lua k,v = box.space[16].index[1]:next(k)"
-exec admin "lua print(v)"
-exec admin "lua box.space[16]:truncate()"
-exec admin "lua print(v)"
-exec admin "lua collectgarbage('collect')"
-exec admin "lua print(v)"
-exec admin "lua k,v = box.space[16].index[1]:next(k)"
-exec admin "lua print(v)"
-exec admin "lua collectgarbage('collect')"
-exec admin "lua print(v)"
-exec admin "lua k,v = box.space[16].index[1]:next(k)"
-exec admin "lua print(v)"
-exec admin "lua k,v = box.space[16].index[1]:next(k)"
-exec admin "lua print(v)"
-exec admin "lua k,v = box.space[16].index[1]:next(k)"
-exec admin "lua print(v)"
+admin("lua box.space[16]:insert('a', 'a', 'a')", silent=False)
+admin("lua box.space[16]:insert('d', 'd', 'd')", silent=False)
+admin("lua box.space[16]:insert('e', 'e', 'e')", silent=False)
+admin("lua box.space[16]:insert('b', 'b', 'b')", silent=False)
+admin("lua box.space[16]:insert('c', 'c', 'c')", silent=False)
+admin("lua k,v = box.space[16].index[1]:next(k)", silent=False)
+admin("lua print(v)", silent=False)
+admin("lua k,v = box.space[16].index[1]:next(k)", silent=False)
+admin("lua print(v)", silent=False)
+admin("lua box.space[16]:truncate()", silent=False)
+admin("lua print(v)", silent=False)
+admin("lua collectgarbage('collect')", silent=False)
+admin("lua print(v)", silent=False)
+admin("lua k,v = box.space[16].index[1]:next(k)", silent=False)
+admin("lua print(v)", silent=False)
+admin("lua collectgarbage('collect')", silent=False)
+admin("lua print(v)", silent=False)
+admin("lua k,v = box.space[16].index[1]:next(k)", silent=False)
+admin("lua print(v)", silent=False)
+admin("lua k,v = box.space[16].index[1]:next(k)", silent=False)
+admin("lua print(v)", silent=False)
+admin("lua k,v = box.space[16].index[1]:next(k)", silent=False)
+admin("lua print(v)", silent=False)
# Bug #1082356
-exec sql "insert into t19 values(1, 1)"
-exec sql "replace into t19 values(1, 1)"
+sql("insert into t19 values(1, 1)", silent=False)
+sql("replace into t19 values(1, 1)", silent=False)
diff --git a/test/big/tree_variants.test b/test/big/tree_variants.test
index 8053cf4d6f..c41fb14355 100644
--- a/test/big/tree_variants.test
+++ b/test/big/tree_variants.test
@@ -1,47 +1,47 @@
-# encoding: tarantool
+# encoding: utf-8
#
-exec sql "insert into t6 values (0, '00000000', '00000100', 'Joe', 'Sixpack', 'Drinks', 'Amstel', 'bar', 2000 )"
-exec sql "insert into t6 values (1, '00000001', '00000200', 'Joe', 'Sixpack', 'Drinks', 'Heineken', 'bar', 2001 )"
-exec sql "insert into t6 values (2, '00000002', '00000200', 'Joe', 'Sixpack', 'Drinks', 'Carlsberg', 'bar', 2002 )"
-exec sql "insert into t6 values (3, '00000003', '00000300', 'Joe', 'Sixpack', 'Drinks', 'Corona Extra', 'bar', 2003 )"
-exec sql "insert into t6 values (4, '00000004', '00000300', 'Joe', 'Sixpack', 'Drinks', 'Stella Artois', 'bar', 2004 )"
-exec sql "insert into t6 values (5, '00000005', '00000300', 'Joe', 'Sixpack', 'Drinks', 'Miller Genuine Draft', 'bar', 2005 )"
-exec sql "insert into t6 values (6, '00000006', '00000400', 'John', 'Smoker', 'Hits', 'A Pipe', 'foo', 2006 )"
-exec sql "insert into t6 values (7, '00000007', '00000400', 'John', 'Smoker', 'Hits', 'A Bong', 'foo', 2007 )"
-exec sql "insert into t6 values (8, '00000008', '00000400', 'John', 'Smoker', 'Rolls', 'A Joint', 'foo', 2008 )"
-exec sql "insert into t6 values (9, '00000009', '00000400', 'John', 'Smoker', 'Rolls', 'A Blunt', 'foo', 2009 )"
+sql("insert into t6 values (0, '00000000', '00000100', 'Joe', 'Sixpack', 'Drinks', 'Amstel', 'bar', 2000 )", silent=False)
+sql("insert into t6 values (1, '00000001', '00000200', 'Joe', 'Sixpack', 'Drinks', 'Heineken', 'bar', 2001 )", silent=False)
+sql("insert into t6 values (2, '00000002', '00000200', 'Joe', 'Sixpack', 'Drinks', 'Carlsberg', 'bar', 2002 )", silent=False)
+sql("insert into t6 values (3, '00000003', '00000300', 'Joe', 'Sixpack', 'Drinks', 'Corona Extra', 'bar', 2003 )", silent=False)
+sql("insert into t6 values (4, '00000004', '00000300', 'Joe', 'Sixpack', 'Drinks', 'Stella Artois', 'bar', 2004 )", silent=False)
+sql("insert into t6 values (5, '00000005', '00000300', 'Joe', 'Sixpack', 'Drinks', 'Miller Genuine Draft', 'bar', 2005 )", silent=False)
+sql("insert into t6 values (6, '00000006', '00000400', 'John', 'Smoker', 'Hits', 'A Pipe', 'foo', 2006 )", silent=False)
+sql("insert into t6 values (7, '00000007', '00000400', 'John', 'Smoker', 'Hits', 'A Bong', 'foo', 2007 )", silent=False)
+sql("insert into t6 values (8, '00000008', '00000400', 'John', 'Smoker', 'Rolls', 'A Joint', 'foo', 2008 )", silent=False)
+sql("insert into t6 values (9, '00000009', '00000400', 'John', 'Smoker', 'Rolls', 'A Blunt', 'foo', 2009 )", silent=False)
-exec sql "select * from t6 where k0 = 1"
-exec sql "select * from t6 where k1 = '00000002'"
-exec sql "select * from t6 where k2 = '00000300'"
-exec admin "lua box.space[6]:select(3, 'Joe', 'Sixpack')"
-exec admin "lua box.space[6]:select(3, 'John')"
-exec admin "lua box.space[6]:select(4, 'A Pipe')"
-exec admin "lua box.space[6]:select(4, 'Miller Genuine Draft', 'Drinks')"
-exec sql "select * from t6 where k5 = 2007"
-exec admin "lua box.space[6]:select(6, 'Miller Genuine Draft', 'Drinks')"
+sql("select * from t6 where k0 = 1", silent=False)
+sql("select * from t6 where k1 = '00000002'", silent=False)
+sql("select * from t6 where k2 = '00000300'", silent=False)
+admin("lua box.space[6]:select(3, 'Joe', 'Sixpack')", silent=False)
+admin("lua box.space[6]:select(3, 'John')", silent=False)
+admin("lua box.space[6]:select(4, 'A Pipe')", silent=False)
+admin("lua box.space[6]:select(4, 'Miller Genuine Draft', 'Drinks')", silent=False)
+sql("select * from t6 where k5 = 2007", silent=False)
+admin("lua box.space[6]:select(6, 'Miller Genuine Draft', 'Drinks')", silent=False)
-exec sql "delete from t6 where k0 = 6"
-exec sql "delete from t6 where k0 = 7"
-exec sql "delete from t6 where k0 = 8"
-exec sql "delete from t6 where k0 = 9"
+sql("delete from t6 where k0 = 6", silent=False)
+sql("delete from t6 where k0 = 7", silent=False)
+sql("delete from t6 where k0 = 8", silent=False)
+sql("delete from t6 where k0 = 9", silent=False)
-exec admin "lua box.insert(6, 6, 6ULL, 400ULL, 'John', 'Smoker', 'Hits', 'A Pipe', 'foo', 2006 )"
-exec admin "lua box.insert(6, 7, 7ULL, 400ULL, 'John', 'Smoker', 'Hits', 'A Bong', 'foo', 2007 )"
-exec admin "lua box.insert(6, 8, 8ULL, 400ULL, 'John', 'Smoker', 'Rolls', 'A Joint', 'foo', 2008 )"
-exec admin "lua box.insert(6, 9, 9ULL, 400ULL, 'John', 'Smoker', 'Rolls', 'A Blunt', 'foo', 2009 )"
+admin("lua box.insert(6, 6, 6ULL, 400ULL, 'John', 'Smoker', 'Hits', 'A Pipe', 'foo', 2006 )", silent=False)
+admin("lua box.insert(6, 7, 7ULL, 400ULL, 'John', 'Smoker', 'Hits', 'A Bong', 'foo', 2007 )", silent=False)
+admin("lua box.insert(6, 8, 8ULL, 400ULL, 'John', 'Smoker', 'Rolls', 'A Joint', 'foo', 2008 )", silent=False)
+admin("lua box.insert(6, 9, 9ULL, 400ULL, 'John', 'Smoker', 'Rolls', 'A Blunt', 'foo', 2009 )", silent=False)
-exec admin "lua box.select(6, 1, 6ULL)"
-exec admin "lua box.select(6, 1, 6)"
-exec admin "lua box.select(6, 2, 400ULL)"
-exec admin "lua box.select(6, 2, 400)"
+admin("lua box.select(6, 1, 6ULL)", silent=False)
+admin("lua box.select(6, 1, 6)", silent=False)
+admin("lua box.select(6, 2, 400ULL)", silent=False)
+admin("lua box.select(6, 2, 400)", silent=False)
-exec admin "lua for k,v in box.space[6]:pairs() do print(v) end"
+admin("lua for k,v in box.space[6]:pairs() do print(v) end", silent=False)
# Test incorrect keys - supplied key field type does not match index type
# https://bugs.launchpad.net/tarantool/+bug/1072624
-exec sql "insert into t6 VALUES('', '00000001', '00000002', '', '', '', '', '', 0)"
-exec sql "insert into t6 VALUES('xxxxxxxx', '00000001', '00000002', '', '', '', '', '', 0)"
-exec sql "insert into t6 VALUES(1, '', '00000002', '', '', '', '', '', 0)"
-exec sql "insert into t6 VALUES(1, 'xxxxxxxxxxx', '00000002', '', '', '', '', '', 0)"
+sql("insert into t6 VALUES('', '00000001', '00000002', '', '', '', '', '', 0)", silent=False)
+sql("insert into t6 VALUES('xxxxxxxx', '00000001', '00000002', '', '', '', '', '', 0)", silent=False)
+sql("insert into t6 VALUES(1, '', '00000002', '', '', '', '', '', 0)", silent=False)
+sql("insert into t6 VALUES(1, 'xxxxxxxxxxx', '00000002', '', '', '', '', '', 0)", silent=False)
diff --git a/test/box/admin.test b/test/box/admin.test
index fb23748249..8f51c96681 100644
--- a/test/box/admin.test
+++ b/test/box/admin.test
@@ -1,29 +1,29 @@
-# encoding: tarantool
+# encoding: utf-8
#
import sys
# clear statistics:
server.stop()
server.deploy()
-exec admin "exit"
-exec admin "show stat"
-exec admin "help"
-exec admin "show configuration"
-exec admin "show stat"
-exec sql "insert into t0 values (1, 'tuple')"
-exec admin "save snapshot"
-exec sql "delete from t0 where k0 = 1"
+admin("exit")
+admin("show stat")
+admin("help")
+admin("show configuration")
+admin("show stat")
+sql("insert into t0 values (1, 'tuple')")
+admin("save snapshot")
+sql("delete from t0 where k0 = 1")
sys.stdout.push_filter("(\d)\.\d\.\d(-\d+-\w+)?", "\\1.minor.patch-<rev>-<commit>")
sys.stdout.push_filter("pid: \d+", "pid: <pid>")
sys.stdout.push_filter("logger_pid: \d+", "pid: <pid>")
sys.stdout.push_filter("uptime: \d+", "uptime: <uptime>")
sys.stdout.push_filter("uptime: \d+", "uptime: <uptime>")
sys.stdout.push_filter("(/\S+)+/tarantool", "tarantool")
-exec admin "show info"
+admin("show info")
sys.stdout.clear_all_filters()
sys.stdout.push_filter(".*", "")
-exec admin "show fiber"
-exec admin "show slab"
-exec admin "show palloc"
+admin("show fiber")
+admin("show slab")
+admin("show palloc")
sys.stdout.clear_all_filters()
diff --git a/test/box/admin_coredump.test b/test/box/admin_coredump.test
index bf5b8eccce..3bf62e8a38 100644
--- a/test/box/admin_coredump.test
+++ b/test/box/admin_coredump.test
@@ -1,7 +1,7 @@
-# encoding: tarantool
+# encoding: utf-8
#
import sys
# moved to separete test becouse this test fail in the valgrind mode (coredump
# process terminated via abort procedure).
-exec admin "save coredump"
+admin("save coredump")
# vim: syntax=python
diff --git a/test/box/cjson.test b/test/box/cjson.test
index c44d07cc13..5900409d72 100644
--- a/test/box/cjson.test
+++ b/test/box/cjson.test
@@ -1,13 +1,13 @@
-# encoding: tarantool
+# encoding: utf-8
#
print("cjson tests")
-exec admin "lua type(box.cjson)"
-exec admin "lua box.cjson.encode(123)"
-exec admin "lua box.cjson.encode({123})"
-exec admin "lua box.cjson.encode({123, 234, 345})"
-exec admin "lua box.cjson.encode({abc = 234, cde = 345})"
-exec admin "lua box.cjson.encode({ÐœÐµÑ‚Ð°Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ = { 'Метазначение' } })"
+admin("lua type(box.cjson)")
+admin("lua box.cjson.encode(123)")
+admin("lua box.cjson.encode({123})")
+admin("lua box.cjson.encode({123, 234, 345})")
+admin("lua box.cjson.encode({abc = 234, cde = 345})")
+admin("lua box.cjson.encode({ÐœÐµÑ‚Ð°Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ = { 'Метазначение' } })")
-exec admin "lua box.cjson.decode('123')"
-exec admin "lua box.cjson.decode('[123, \"Кудыкины горы\"]')[2]"
-exec admin "lua box.cjson.decode('{\"test\": \"Результат\"}').test"
+admin("lua box.cjson.decode('123')")
+admin("lua box.cjson.decode('[123, \"Кудыкины горы\"]')[2]")
+admin("lua box.cjson.decode('{\"test\": \"Результат\"}').test")
diff --git a/test/box/configuration.test b/test/box/configuration.test
index 9ed8d7e7be..0dbd67936f 100644
--- a/test/box/configuration.test
+++ b/test/box/configuration.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
#
import os
@@ -19,7 +19,7 @@ server.stop()
# start server from config with holes in spaces
server.deploy("box/tarantool_bug708685.cfg")
# check connection
-exec admin "show configuration"
+admin("show configuration")
print """
# Bug #884768:
@@ -31,7 +31,7 @@ server.stop()
# start server from config with different boolean represenation
server.deploy("box/tarantool_bug884768.cfg")
# check values
-exec admin "show configuration"
+admin("show configuration")
print """
# Bug #876541:
@@ -42,7 +42,7 @@ print """
server.stop()
server.deploy("box/tarantool_bug876541.cfg")
# check values
-exec admin "lua box.cfg.wal_fsync_delay"
+admin("lua box.cfg.wal_fsync_delay")
print """
# Bug#928413 Lua malfunction on certain configuration
@@ -52,9 +52,9 @@ print """
server.stop()
server.deploy("box/tarantool_bug928413.cfg")
# check values
-exec admin "lua box.cfg.wal_fsync_delay"
-exec admin "lua box.space[0].enabled"
-exec admin "reload configuration"
+admin("lua box.cfg.wal_fsync_delay")
+admin("lua box.space[0].enabled")
+admin("reload configuration")
print """
# Test field type conflict in keys
@@ -73,7 +73,7 @@ shutil.copy("box/test_init.lua", os.path.join(script_dir_path, "init.lua"))
server.stop()
server.deploy("box/tarantool_scriptdir.cfg")
-exec admin "lua print_config()"
+admin("lua print_config()")
# restore default server
diff --git a/test/box/errinj.test b/test/box/errinj.test
index 63d1a04ce6..68696811d3 100644
--- a/test/box/errinj.test
+++ b/test/box/errinj.test
@@ -1,46 +1,46 @@
-# encoding: tarantool
+# encoding: utf-8
#
import sys
# clear statistics:
server.stop()
server.deploy()
-exec admin "show injections"
-exec admin "set injection some-injection on"
-exec sql "select * from t0 where k0 = 222444"
-exec admin "set injection ERRINJ_TESTING on"
-exec sql "select * from t0 where k0 = 222444"
-exec admin "set injection ERRINJ_TESTING off"
+admin("show injections")
+admin("set injection some-injection on")
+sql("select * from t0 where k0 = 222444")
+admin("set injection ERRINJ_TESTING on")
+sql("select * from t0 where k0 = 222444")
+admin("set injection ERRINJ_TESTING off")
# Check how well we handle a failed log write.
-exec admin "set injection ERRINJ_WAL_IO on"
-exec sql "insert into t0 values (1)"
-exec sql "select * from t0 where k0=1"
-exec admin "set injection ERRINJ_WAL_IO off"
-exec sql "insert into t0 values (1)"
-exec admin "set injection ERRINJ_WAL_IO on"
-exec sql "update t0 set k0=2 where k0=1"
-exec sql "select * from t0 where k0=1"
-exec sql "select * from t0 where k0=2"
-exec admin "set injection ERRINJ_WAL_IO off"
-exec admin "lua box.space[0]:truncate()"
+admin("set injection ERRINJ_WAL_IO on")
+sql("insert into t0 values (1)")
+sql("select * from t0 where k0=1")
+admin("set injection ERRINJ_WAL_IO off")
+sql("insert into t0 values (1)")
+admin("set injection ERRINJ_WAL_IO on")
+sql("update t0 set k0=2 where k0=1")
+sql("select * from t0 where k0=1")
+sql("select * from t0 where k0=2")
+admin("set injection ERRINJ_WAL_IO off")
+admin("lua box.space[0]:truncate()")
# Check a failed log rotation.
-exec admin "set injection ERRINJ_WAL_ROTATE on"
-exec sql "insert into t0 values (1)"
-exec sql "select * from t0 where k0=1"
-exec admin "set injection ERRINJ_WAL_ROTATE off"
-exec sql "insert into t0 values (1)"
-exec admin "set injection ERRINJ_WAL_ROTATE on"
-exec sql "update t0 set k0=2 where k0=1"
-exec sql "select * from t0 where k0=1"
-exec sql "select * from t0 where k0=2"
-exec admin "set injection ERRINJ_WAL_ROTATE off"
-exec sql "update t0 set k0=2 where k0=1"
-exec sql "select * from t0 where k0=1"
-exec sql "select * from t0 where k0=2"
-exec admin "set injection ERRINJ_WAL_ROTATE on"
-exec admin "lua box.space[0]:truncate()"
-exec admin "set injection ERRINJ_WAL_ROTATE off"
-exec admin "lua box.space[0]:truncate()"
+admin("set injection ERRINJ_WAL_ROTATE on")
+sql("insert into t0 values (1)")
+sql("select * from t0 where k0=1")
+admin("set injection ERRINJ_WAL_ROTATE off")
+sql("insert into t0 values (1)")
+admin("set injection ERRINJ_WAL_ROTATE on")
+sql("update t0 set k0=2 where k0=1")
+sql("select * from t0 where k0=1")
+sql("select * from t0 where k0=2")
+admin("set injection ERRINJ_WAL_ROTATE off")
+sql("update t0 set k0=2 where k0=1")
+sql("select * from t0 where k0=1")
+sql("select * from t0 where k0=2")
+admin("set injection ERRINJ_WAL_ROTATE on")
+admin("lua box.space[0]:truncate()")
+admin("set injection ERRINJ_WAL_ROTATE off")
+admin("lua box.space[0]:truncate()")
# vim: syntax=python
diff --git a/test/box/fiber.test b/test/box/fiber.test
index ec15bf044d..966f2889ab 100644
--- a/test/box/fiber.test
+++ b/test/box/fiber.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
import sys
# A test case for a race condition between ev_schedule
# and wal_schedule fiber schedulers.
@@ -7,76 +7,76 @@ import sys
# The test case is dependent on rows_per_wal, since this is when
# we reopen the .xlog file and thus wal_scheduler takes a long
# pause.
-exec admin "lua box.cfg.rows_per_wal"
-exec sql "insert into t0 values (1, 'testing', 'lua rocks')"
-exec sql "delete from t0 where k0=1"
-exec sql "insert into t0 values (1, 'testing', 'lua rocks')"
-exec sql "delete from t0 where k0=1"
+admin("lua box.cfg.rows_per_wal")
+sql("insert into t0 values (1, 'testing', 'lua rocks')")
+sql("delete from t0 where k0=1")
+sql("insert into t0 values (1, 'testing', 'lua rocks')")
+sql("delete from t0 where k0=1")
# check delete:
-exec admin "lua box.process(17, box.pack('iiiiiip', 0, 0, 0, 2^31, 1, 1, 1))"
-exec admin "lua box.process(22, box.pack('iii', 0, 0, 0))"
+admin("lua box.process(17, box.pack('iiiiiip', 0, 0, 0, 2^31, 1, 1, 1))")
+admin("lua box.process(22, box.pack('iii', 0, 0, 0))")
-exec sql "insert into t0 values (1, 'test box delete')"
-exec sql "call box.delete('0', '\1\0\0\0')"
-exec sql "insert into t0 values (1, 'test box delete')"
-exec admin "lua box.delete(0, 1)"
-exec sql "insert into t0 values ('abcd', 'test box delete')"
-exec sql "call box.delete('0', 'abcd')"
-exec sql "insert into t0 values ('abcd', 'test box delete')"
-exec admin "lua box.delete(0, 'abcd')"
-exec sql "insert into t0 values ('abcd', 'test box.select()')"
-exec sql "call box.replace('0', 'abcd', 'hello', 'world')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.replace('0', 'abcd')"
-exec sql "call box.delete('0', 'abcd')"
-exec sql "call box.delete('0', 'defc')"
-exec sql "call box.insert('0', 'test', 'old', 'abcd')"
+sql("insert into t0 values (1, 'test box delete')")
+sql("call box.delete('0', '\1\0\0\0')")
+sql("insert into t0 values (1, 'test box delete')")
+admin("lua box.delete(0, 1)")
+sql("insert into t0 values ('abcd', 'test box delete')")
+sql("call box.delete('0', 'abcd')")
+sql("insert into t0 values ('abcd', 'test box delete')")
+admin("lua box.delete(0, 'abcd')")
+sql("insert into t0 values ('abcd', 'test box.select()')")
+sql("call box.replace('0', 'abcd', 'hello', 'world')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.replace('0', 'abcd')")
+sql("call box.delete('0', 'abcd')")
+sql("call box.delete('0', 'defc')")
+sql("call box.insert('0', 'test', 'old', 'abcd')")
# test that insert produces a duplicate key error
-exec sql "call box.insert('0', 'test', 'old', 'abcd')"
-exec sql "call box.update('0', 'test', '=p=p', 0, 'pass', 1, 'new')"
-exec sql "call box.update('0', 'miss', '+p', 2, '\1\0\0\0')"
-exec sql "call box.update('0', 'pass', '+p', 2, '\1\0\0\0')"
-exec sql "call box.update('0', 'pass', '-p', 2, '\1\0\0\0')"
-exec sql "call box.update('0', 'pass', '-p', 2, '\1\0\0\0')"
-exec admin "lua box.update(0, 'pass', '+p', 2, 1)"
-exec sql "call box.delete('0', 'pass')"
-exec admin "reload configuration"
+sql("call box.insert('0', 'test', 'old', 'abcd')")
+sql("call box.update('0', 'test', '=p=p', 0, 'pass', 1, 'new')")
+sql("call box.update('0', 'miss', '+p', 2, '\1\0\0\0')")
+sql("call box.update('0', 'pass', '+p', 2, '\1\0\0\0')")
+sql("call box.update('0', 'pass', '-p', 2, '\1\0\0\0')")
+sql("call box.update('0', 'pass', '-p', 2, '\1\0\0\0')")
+admin("lua box.update(0, 'pass', '+p', 2, 1)")
+sql("call box.delete('0', 'pass')")
+admin("reload configuration")
# must be read-only
-exec admin "lua box.insert(0, 'test')"
-exec admin "lua box.insert(0, 'abcd')"
-exec admin "lua box.delete(0, 'test')"
-exec admin "lua box.delete(0, 'abcd')"
-exec admin "lua box.space[0]:insert('test', 'hello world')"
-exec admin "lua box.space[0]:update('test', '=p', 1, 'bye, world')"
-exec admin "lua box.space[0]:delete('test')"
+admin("lua box.insert(0, 'test')")
+admin("lua box.insert(0, 'abcd')")
+admin("lua box.delete(0, 'test')")
+admin("lua box.delete(0, 'abcd')")
+admin("lua box.space[0]:insert('test', 'hello world')")
+admin("lua box.space[0]:update('test', '=p', 1, 'bye, world')")
+admin("lua box.space[0]:delete('test')")
# test tuple iterators
-exec admin "lua t=box.space[0]:insert('test')"
-exec admin "lua t=box.space[0]:replace('test', 'another field')"
-exec admin "lua t=box.space[0]:replace('test', 'another field', 'one more')"
-exec admin "lua box.space[0]:truncate()"
+admin("lua t=box.space[0]:insert('test')")
+admin("lua t=box.space[0]:replace('test', 'another field')")
+admin("lua t=box.space[0]:replace('test', 'another field', 'one more')")
+admin("lua box.space[0]:truncate()")
# test passing arguments in and out created fiber
-exec admin "lua function y() print('started') box.fiber.detach() while true do box.replace(0, 'test', os.time()) box.fiber.sleep(0.001) end end"
-exec admin "lua f = box.fiber.create(y)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua box.fiber.sleep(0.002)"
-exec admin "lua box.fiber.cancel(f)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua for k=1, 1000, 1 do box.fiber.create(function() box.fiber.detach() end) end"
-exec admin "lua collectgarbage('collect')"
+admin("lua function y() print('started') box.fiber.detach() while true do box.replace(0, 'test', os.time()) box.fiber.sleep(0.001) end end")
+admin("lua f = box.fiber.create(y)")
+admin("lua box.fiber.resume(f)")
+admin("lua box.fiber.sleep(0.002)")
+admin("lua box.fiber.cancel(f)")
+admin("lua box.fiber.resume(f)")
+admin("lua for k=1, 1000, 1 do box.fiber.create(function() box.fiber.detach() end) end")
+admin("lua collectgarbage('collect')")
# check that these newly created fibers are garbage collected
-exec admin "lua box.fiber.find(900)"
-exec admin "lua box.fiber.find(910)"
-exec admin "lua box.fiber.find(920)"
-exec admin "lua box.space[0]:truncate()"
+admin("lua box.fiber.find(900)")
+admin("lua box.fiber.find(910)")
+admin("lua box.fiber.find(920)")
+admin("lua box.space[0]:truncate()")
diff --git a/test/box/info.test b/test/box/info.test
index 40a305c4cc..151e1d47b8 100644
--- a/test/box/info.test
+++ b/test/box/info.test
@@ -1,29 +1,29 @@
-# encoding: tarantool
+# encoding: utf-8
import os
import sys
# Test Lua from admin console. Whenever producing output,
# make sure it's a valid YAML.
-exec admin "lua box.info.unknown_variable"
-exec admin "lua box.info[23]"
-exec admin "lua box.info['unknown_variable']"
-exec admin "lua string.match(box.info.version, '^[1-9]') ~= nil"
-exec admin "lua string.match(box.info.pid, '^[1-9][0-9]*$') ~= nil"
-exec admin "lua string.match(box.info.logger_pid, '^[1-9][0-9]*$') ~= nil"
-# exec admin "lua box.info.lsn() > 0"
-# exec admin "lua box.info.recovery_lag()"
-# exec admin "lua box.info.recovery_last_update()"
-# exec admin "lua box.info.status()"
-exec admin "lua box.info.lsn > 0"
-exec admin "lua box.info.recovery_lag"
-exec admin "lua box.info.recovery_last_update"
-exec admin "lua box.info.status"
-exec admin "lua string.len(box.info.config) > 0"
-exec admin "lua string.len(box.info.build.target) > 0"
-exec admin "lua string.len(box.info.build.compiler) > 0"
-exec admin "lua string.len(box.info.build.flags) > 0"
-exec admin "lua string.len(box.info.build.options) > 0"
-exec admin "lua string.len(box.info.uptime) > 0"
-exec admin "lua string.match(box.info.uptime, '^[1-9][0-9]*$') ~= nil"
+admin("lua box.info.unknown_variable")
+admin("lua box.info[23]")
+admin("lua box.info['unknown_variable']")
+admin("lua string.match(box.info.version, '^[1-9]') ~= nil")
+admin("lua string.match(box.info.pid, '^[1-9][0-9]*$') ~= nil")
+admin("lua string.match(box.info.logger_pid, '^[1-9][0-9]*$') ~= nil")
+# admin("lua box.info.lsn() > 0")
+# admin("lua box.info.recovery_lag()")
+# admin("lua box.info.recovery_last_update()")
+# admin("lua box.info.status()")
+admin("lua box.info.lsn > 0")
+admin("lua box.info.recovery_lag")
+admin("lua box.info.recovery_last_update")
+admin("lua box.info.status")
+admin("lua string.len(box.info.config) > 0")
+admin("lua string.len(box.info.build.target) > 0")
+admin("lua string.len(box.info.build.compiler) > 0")
+admin("lua string.len(box.info.build.flags) > 0")
+admin("lua string.len(box.info.build.options) > 0")
+admin("lua string.len(box.info.uptime) > 0")
+admin("lua string.match(box.info.uptime, '^[1-9][0-9]*$') ~= nil")
-exec admin "lua for k, v in pairs(box.info()) do print(k) end"
-exec admin "lua box.info.snapshot_pid"
+admin("lua for k, v in pairs(box.info()) do print(k) end")
+admin("lua box.info.snapshot_pid")
diff --git a/test/box/ipc.test b/test/box/ipc.test
index fd1d319e9f..a50d600b79 100644
--- a/test/box/ipc.test
+++ b/test/box/ipc.test
@@ -1,61 +1,61 @@
-# encoding: tarantool
+# encoding: utf-8
#
import sys
-exec admin "lua ch = box.ipc.channel()"
-exec admin "lua ch:is_full()"
-exec admin "lua ch:is_empty()"
-exec admin "lua ch:get(.1)"
-exec admin "lua ch:put()"
-exec admin "lua ch:put('test')"
-exec admin "lua ch:get()"
-exec admin "lua ch:get('wrong timeout')"
-exec admin "lua ch:get(-10)"
-exec admin "lua ch:put(234)"
-exec admin "lua ch:put(345, .5)"
-exec admin "lua ch:is_full()"
-exec admin "lua ch:is_empty()"
-exec admin "lua buffer = {}"
-exec admin "lua tfbr = box.fiber.create(function() box.fiber.detach() while true do table.insert(buffer, ch:get()) end end)"
-exec admin "lua box.fiber.resume(tfbr)"
-exec admin "lua for i = 1, 10 do print(i, ' ', ch:put(i, 0.1)) end"
-exec admin "lua ch:has_readers()"
-exec admin "lua ch:has_writers()"
-exec admin "lua box.fiber.cancel(tfbr)"
-
-exec admin "lua ch:has_readers()"
-exec admin "lua ch:has_writers()"
-exec admin "lua ch:put(box.info.pid)"
-exec admin "lua ch:is_full()"
-exec admin "lua ch:is_empty()"
-exec admin "lua ch:get(box.info.pid) == box.info.pid"
-exec admin "lua for i, v in pairs(buffer) do print(v) end"
-
-exec admin "lua ch:is_empty()"
-exec admin "lua ch:broadcast()"
-exec admin "lua ch:broadcast(123)"
-exec admin "lua ch:get()"
-
-exec admin "lua ch:is_full()"
-exec admin "lua ch:is_empty()"
-exec admin "lua tfbr = box.fiber.create(function() box.fiber.detach() while true do local v = ch:get() table.insert(buffer, 'tfbr - ' .. tostring(v)) end end)"
-exec admin "lua box.fiber.resume(tfbr)"
-exec admin "lua tfbr2 = box.fiber.create(function() box.fiber.detach() while true do local v = ch:get() table.insert(buffer, 'tfbr2 - ' .. tostring(v)) end end)"
-exec admin "lua box.fiber.resume(tfbr2)"
-
-exec admin "lua buffer = {}"
-
-exec admin "lua for i, v in pairs(buffer) do print(v) end"
-exec admin "lua ch:is_full()"
-exec admin "lua ch:is_empty()"
-exec admin "lua ch:put(1)"
-exec admin "lua ch:put(2)"
-exec admin "lua ch:put(3)"
-exec admin "lua ch:put(4)"
-exec admin "lua ch:put(5)"
-exec admin "lua ch:broadcast('broadcast message!')"
-exec admin "lua for i = 35, 45 do print(ch:put(i)) end"
-
-
-exec admin "lua for i, v in pairs(buffer) do print(v) end"
+admin("lua ch = box.ipc.channel()")
+admin("lua ch:is_full()")
+admin("lua ch:is_empty()")
+admin("lua ch:get(.1)")
+admin("lua ch:put()")
+admin("lua ch:put('test')")
+admin("lua ch:get()")
+admin("lua ch:get('wrong timeout')")
+admin("lua ch:get(-10)")
+admin("lua ch:put(234)")
+admin("lua ch:put(345, .5)")
+admin("lua ch:is_full()")
+admin("lua ch:is_empty()")
+admin("lua buffer = {}")
+admin("lua tfbr = box.fiber.create(function() box.fiber.detach() while true do table.insert(buffer, ch:get()) end end)")
+admin("lua box.fiber.resume(tfbr)")
+admin("lua for i = 1, 10 do print(i, ' ', ch:put(i, 0.1)) end")
+admin("lua ch:has_readers()")
+admin("lua ch:has_writers()")
+admin("lua box.fiber.cancel(tfbr)")
+
+admin("lua ch:has_readers()")
+admin("lua ch:has_writers()")
+admin("lua ch:put(box.info.pid)")
+admin("lua ch:is_full()")
+admin("lua ch:is_empty()")
+admin("lua ch:get(box.info.pid) == box.info.pid")
+admin("lua for i, v in pairs(buffer) do print(v) end")
+
+admin("lua ch:is_empty()")
+admin("lua ch:broadcast()")
+admin("lua ch:broadcast(123)")
+admin("lua ch:get()")
+
+admin("lua ch:is_full()")
+admin("lua ch:is_empty()")
+admin("lua tfbr = box.fiber.create(function() box.fiber.detach() while true do local v = ch:get() table.insert(buffer, 'tfbr - ' .. tostring(v)) end end)")
+admin("lua box.fiber.resume(tfbr)")
+admin("lua tfbr2 = box.fiber.create(function() box.fiber.detach() while true do local v = ch:get() table.insert(buffer, 'tfbr2 - ' .. tostring(v)) end end)")
+admin("lua box.fiber.resume(tfbr2)")
+
+admin("lua buffer = {}")
+
+admin("lua for i, v in pairs(buffer) do print(v) end")
+admin("lua ch:is_full()")
+admin("lua ch:is_empty()")
+admin("lua ch:put(1)")
+admin("lua ch:put(2)")
+admin("lua ch:put(3)")
+admin("lua ch:put(4)")
+admin("lua ch:put(5)")
+admin("lua ch:broadcast('broadcast message!')")
+admin("lua for i = 35, 45 do print(ch:put(i)) end")
+
+
+admin("lua for i, v in pairs(buffer) do print(v) end")
diff --git a/test/box/iproto.test b/test/box/iproto.test
index 2b294a38c9..c564048517 100644
--- a/test/box/iproto.test
+++ b/test/box/iproto.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
import os
import sys
import struct
@@ -21,7 +21,7 @@ print "# sending the package with invalid length"
inval_request = struct.pack('<LLL', 17, 4294967290, 1)
print s.send(inval_request)
print "# checking what is server alive"
-exec sql "ping"
+sql("ping")
# closing connection
s.close()
diff --git a/test/box/lua.test b/test/box/lua.test
index b9640c198f..a3a67af5a9 100644
--- a/test/box/lua.test
+++ b/test/box/lua.test
@@ -1,219 +1,219 @@
-# encoding: tarantool
+# encoding: utf-8
import os
import sys
# Test Lua from admin console. Whenever producing output,
# make sure it's a valid YAML.
-exec admin "lua"
-exec admin "lua 1"
-exec admin "lua print(' lua says: hello')"
+admin("lua")
+admin("lua 1")
+admin("lua print(' lua says: hello')")
# What's in the box?
-exec admin "lua local t = {} for n in pairs(box) do table.insert(t, ' - box.' .. tostring(n)) end table.sort(t) for i = 1, #t do print(t[i]) end t = nil"
+admin("lua local t = {} for n in pairs(box) do table.insert(t, ' - box.' .. tostring(n)) end table.sort(t) for i = 1, #t do print(t[i]) end t = nil")
# Test box.pack()
-exec admin "lua box.pack()"
-exec admin "lua box.pack(1)"
-exec admin "lua box.pack('abc')"
-exec admin "lua print(box.pack('a', ' - hello'))"
-exec admin "lua print(box.pack('Aa', ' - hello', ' world'))"
-exec admin "lua print(box.pack('w', 0x30))"
-exec admin "lua print(box.pack('www', 0x30, 0x30, 0x30))"
-exec admin "lua print(box.pack('www', 0x3030, 0x30))"
-exec admin "lua print(string.byte(box.pack('w', 212345), 1, 2))"
-exec admin "lua print(string.sub(box.pack('p', 1684234849), 2))"
-exec admin "lua print(box.pack('p', 'this string is 45 characters long 1234567890 '))"
-exec admin "lua print(box.pack('s', 0x4d))"
-exec admin "lua print(box.pack('ssss', 25940, 29811, 28448, 11883))"
-exec admin "lua print(box.pack('SSSS', 25940, 29811, 28448, 11883))"
-exec admin "lua print(box.pack('SSSSSSSS', 28493, 29550, 27680, 27497, 29541, 20512, 29285, 8556))"
-exec admin "lua print(box.pack('bsilww', 84, 29541, 1802444916, 2338318684567380014ULL, 103, 111))"
-exec admin "lua print(box.unpack('b', 'T'))"
-exec admin "lua print(box.unpack('s', 'Te'))"
-exec admin "lua print(box.unpack('i', 'Test'))"
-exec admin "lua print(box.unpack('l', 'Test ok.'))"
-exec admin "lua box.unpack('bsil', box.pack('bsil', 255, 65535, 4294967295, tonumber64('18446744073709551615')))"
-exec admin "lua box.unpack('www', box.pack('www', 255, 65535, 4294967295))"
-exec admin "lua box.unpack('ppp', box.pack('ppp', 'one', 'two', 'three'))"
-exec admin "lua num, str, num64 = box.unpack('ppp', box.pack('ppp', 666, 'string', tonumber64('666666666666666')))"
-exec admin "lua print(box.unpack('i', num), str, box.unpack('l', num64))"
-exec admin "lua box.unpack('=p', box.pack('=p', 1, '666'))"
-exec admin "lua box.unpack('','')"
-exec admin "lua box.unpack('ii', box.pack('i', 1))"
-exec admin "lua box.unpack('i', box.pack('ii', 1, 1))"
-exec admin "lua box.unpack('+p', box.pack('=p', 1, '666'))"
+admin("lua box.pack()")
+admin("lua box.pack(1)")
+admin("lua box.pack('abc')")
+admin("lua print(box.pack('a', ' - hello'))")
+admin("lua print(box.pack('Aa', ' - hello', ' world'))")
+admin("lua print(box.pack('w', 0x30))")
+admin("lua print(box.pack('www', 0x30, 0x30, 0x30))")
+admin("lua print(box.pack('www', 0x3030, 0x30))")
+admin("lua print(string.byte(box.pack('w', 212345), 1, 2))")
+admin("lua print(string.sub(box.pack('p', 1684234849), 2))")
+admin("lua print(box.pack('p', 'this string is 45 characters long 1234567890 '))")
+admin("lua print(box.pack('s', 0x4d))")
+admin("lua print(box.pack('ssss', 25940, 29811, 28448, 11883))")
+admin("lua print(box.pack('SSSS', 25940, 29811, 28448, 11883))")
+admin("lua print(box.pack('SSSSSSSS', 28493, 29550, 27680, 27497, 29541, 20512, 29285, 8556))")
+admin("lua print(box.pack('bsilww', 84, 29541, 1802444916, 2338318684567380014ULL, 103, 111))")
+admin("lua print(box.unpack('b', 'T'))")
+admin("lua print(box.unpack('s', 'Te'))")
+admin("lua print(box.unpack('i', 'Test'))")
+admin("lua print(box.unpack('l', 'Test ok.'))")
+admin("lua box.unpack('bsil', box.pack('bsil', 255, 65535, 4294967295, tonumber64('18446744073709551615')))")
+admin("lua box.unpack('www', box.pack('www', 255, 65535, 4294967295))")
+admin("lua box.unpack('ppp', box.pack('ppp', 'one', 'two', 'three'))")
+admin("lua num, str, num64 = box.unpack('ppp', box.pack('ppp', 666, 'string', tonumber64('666666666666666')))")
+admin("lua print(box.unpack('i', num), str, box.unpack('l', num64))")
+admin("lua box.unpack('=p', box.pack('=p', 1, '666'))")
+admin("lua box.unpack('','')")
+admin("lua box.unpack('ii', box.pack('i', 1))")
+admin("lua box.unpack('i', box.pack('ii', 1, 1))")
+admin("lua box.unpack('+p', box.pack('=p', 1, '666'))")
# Test the low-level box.process() call, which takes a binary packet
# and passes it to box for execution.
# insert:
-exec admin "lua box.process(13, box.pack('iiippp', 0, 1, 3, 1, 'testing', 'lua rocks'))"
+admin("lua box.process(13, box.pack('iiippp', 0, 1, 3, 1, 'testing', 'lua rocks'))")
# select:
-exec admin "lua box.process(17, box.pack('iiiiiip', 0, 0, 0, 2^31, 1, 1, 1))"
+admin("lua box.process(17, box.pack('iiiiiip', 0, 0, 0, 2^31, 1, 1, 1))")
# delete:
-exec admin "lua box.process(21, box.pack('iiip', 0, 1, 1, 1))"
+admin("lua box.process(21, box.pack('iiip', 0, 1, 1, 1))")
# check delete:
-exec admin "lua box.process(17, box.pack('iiiiiip', 0, 0, 0, 2^31, 1, 1, 1))"
-exec admin "lua box.process(22, box.pack('iii', 0, 0, 0))"
-exec sql "call box.process('abc', 'def')"
-exec sql "call box.pack('test')"
-exec sql "call box.pack('p', 'this string is 45 characters long 1234567890 ')"
-exec sql "call box.pack('p', 'ascii symbols are visible starting from code 20')"
-exec admin "lua function f1() return 'testing', 1, false, -1, 1.123, 1e123, nil end"
-exec admin "lua f1()"
-exec sql "call f1()"
-exec admin "lua f1=nil"
-exec sql "call f1()"
-exec admin "lua function f1() return f1 end"
-exec sql "call f1()"
-
-exec sql "insert into t0 values (1, 'test box delete')"
-exec sql "call box.delete('0', '\1\0\0\0')"
-exec sql "call box.delete('0', '\1\0\0\0')"
-exec sql "insert into t0 values (1, 'test box delete')"
-exec admin "lua box.delete(0, 1)"
-exec admin "lua box.delete(0, 1)"
-exec sql "insert into t0 values ('abcd', 'test box delete')"
-exec sql "call box.delete('0', '\1\0\0\0')"
-exec sql "call box.delete('0', 'abcd')"
-exec sql "call box.delete('0', 'abcd')"
-exec sql "insert into t0 values ('abcd', 'test box delete')"
-exec admin "lua box.delete(0, 'abcd')"
-exec admin "lua box.delete(0, 'abcd')"
-exec sql "call box.select('0', '0', 'abcd')"
-exec sql "insert into t0 values ('abcd', 'test box.select()')"
-exec sql "call box.select('0', '0', 'abcd')"
-exec admin "lua box.select(0, 0, 'abcd')"
-exec admin "lua box.select(0, 0)"
-exec admin "lua box.select(0, 1)"
-exec admin "lua box.select(0)"
-exec sql "call box.replace('0', 'abcd', 'hello', 'world')"
-exec sql "call box.replace('0', 'defc', 'goodbye', 'universe')"
-exec sql "call box.select('0', '0', 'abcd')"
-exec sql "call box.select('0', '0', 'defc')"
-exec sql "call box.replace('0', 'abcd')"
-exec sql "call box.select('0', '0', 'abcd')"
-exec sql "call box.delete('0', 'abcd')"
-exec sql "call box.delete('0', 'defc')"
-exec sql "call box.insert('0', 'test', 'old', 'abcd')"
+admin("lua box.process(17, box.pack('iiiiiip', 0, 0, 0, 2^31, 1, 1, 1))")
+admin("lua box.process(22, box.pack('iii', 0, 0, 0))")
+sql("call box.process('abc', 'def')")
+sql("call box.pack('test')")
+sql("call box.pack('p', 'this string is 45 characters long 1234567890 ')")
+sql("call box.pack('p', 'ascii symbols are visible starting from code 20')")
+admin("lua function f1() return 'testing', 1, false, -1, 1.123, 1e123, nil end")
+admin("lua f1()")
+sql("call f1()")
+admin("lua f1=nil")
+sql("call f1()")
+admin("lua function f1() return f1 end")
+sql("call f1()")
+
+sql("insert into t0 values (1, 'test box delete')")
+sql("call box.delete('0', '\1\0\0\0')")
+sql("call box.delete('0', '\1\0\0\0')")
+sql("insert into t0 values (1, 'test box delete')")
+admin("lua box.delete(0, 1)")
+admin("lua box.delete(0, 1)")
+sql("insert into t0 values ('abcd', 'test box delete')")
+sql("call box.delete('0', '\1\0\0\0')")
+sql("call box.delete('0', 'abcd')")
+sql("call box.delete('0', 'abcd')")
+sql("insert into t0 values ('abcd', 'test box delete')")
+admin("lua box.delete(0, 'abcd')")
+admin("lua box.delete(0, 'abcd')")
+sql("call box.select('0', '0', 'abcd')")
+sql("insert into t0 values ('abcd', 'test box.select()')")
+sql("call box.select('0', '0', 'abcd')")
+admin("lua box.select(0, 0, 'abcd')")
+admin("lua box.select(0, 0)")
+admin("lua box.select(0, 1)")
+admin("lua box.select(0)")
+sql("call box.replace('0', 'abcd', 'hello', 'world')")
+sql("call box.replace('0', 'defc', 'goodbye', 'universe')")
+sql("call box.select('0', '0', 'abcd')")
+sql("call box.select('0', '0', 'defc')")
+sql("call box.replace('0', 'abcd')")
+sql("call box.select('0', '0', 'abcd')")
+sql("call box.delete('0', 'abcd')")
+sql("call box.delete('0', 'defc')")
+sql("call box.insert('0', 'test', 'old', 'abcd')")
# test that insert produces a duplicate key error
-exec sql "call box.insert('0', 'test', 'old', 'abcd')"
-exec sql "call box.update('0', 'test', '=p=p', '\0\0\0\0', 'pass', 1, 'new')"
-exec sql "call box.select('0', '0', 'pass')"
-exec sql "call box.select_range(0, 0, 1, 'pass')"
-exec sql "call box.update('0', 'miss', '+p', 2, '\1\0\0\0')"
-exec sql "call box.update('0', 'pass', '+p', 2, '\1\0\0\0')"
-exec sql "call box.update('0', 'pass', '-p', 2, '\1\0\0\0')"
-exec sql "call box.update('0', 'pass', '-p', 2, '\1\0\0\0')"
-exec admin "lua box.update(0, 'pass', '+p', 2, 1)"
-exec sql "call box.select('0', '0', 'pass')"
-exec admin "lua function field_x(space, key, field_index) return (box.select(space, 0, key))[tonumber(field_index)] end"
-exec sql "call field_x('0', 'pass', '0')"
-exec sql "call field_x('0', 'pass', '1')"
-exec sql "call box.delete('0', 'pass')"
+sql("call box.insert('0', 'test', 'old', 'abcd')")
+sql("call box.update('0', 'test', '=p=p', '\0\0\0\0', 'pass', 1, 'new')")
+sql("call box.select('0', '0', 'pass')")
+sql("call box.select_range(0, 0, 1, 'pass')")
+sql("call box.update('0', 'miss', '+p', 2, '\1\0\0\0')")
+sql("call box.update('0', 'pass', '+p', 2, '\1\0\0\0')")
+sql("call box.update('0', 'pass', '-p', 2, '\1\0\0\0')")
+sql("call box.update('0', 'pass', '-p', 2, '\1\0\0\0')")
+admin("lua box.update(0, 'pass', '+p', 2, 1)")
+sql("call box.select('0', '0', 'pass')")
+admin("lua function field_x(space, key, field_index) return (box.select(space, 0, key))[tonumber(field_index)] end")
+sql("call field_x('0', 'pass', '0')")
+sql("call field_x('0', 'pass', '1')")
+sql("call box.delete('0', 'pass')")
fifo_lua = os.path.abspath("box/fifo.lua")
# don't log the path name
sys.stdout.push_filter("lua dofile(.*)", "lua dofile(...)")
-exec admin "lua dofile('{0}')".format(fifo_lua)
+admin("lua dofile('{0}')".format(fifo_lua))
sys.stdout.pop_filter()
-exec admin "lua fifo_max"
-exec admin "lua fifo_push('test', 1)"
-exec admin "lua fifo_push('test', 2)"
-exec admin "lua fifo_push('test', 3)"
-exec admin "lua fifo_push('test', 4)"
-exec admin "lua fifo_push('test', 5)"
-exec admin "lua fifo_push('test', 6)"
-exec admin "lua fifo_push('test', 7)"
-exec admin "lua fifo_push('test', 8)"
-exec admin "lua fifo_top('test')"
-exec admin "lua box.delete(0, 'test')"
-exec admin "lua fifo_top('test')"
-exec admin "lua box.delete(0, 'test')"
-exec admin "lua for k,v in pairs(box.cfg) do print(' - ', k, ': ', v) end"
-exec admin "lua for k,v in pairs(box.space[0]) do if type(v) ~= 'table' then print(' - ', k, ': ', v) end end"
-exec admin "reload configuration"
-exec admin "lua for k,v in pairs(box.cfg) do print(' - ', k, ': ', v) end"
-exec admin "lua for k,v in pairs(box.space[0]) do if type(v) ~= 'table' then print(' - ', k, ': ', v) end end"
+admin("lua fifo_max")
+admin("lua fifo_push('test', 1)")
+admin("lua fifo_push('test', 2)")
+admin("lua fifo_push('test', 3)")
+admin("lua fifo_push('test', 4)")
+admin("lua fifo_push('test', 5)")
+admin("lua fifo_push('test', 6)")
+admin("lua fifo_push('test', 7)")
+admin("lua fifo_push('test', 8)")
+admin("lua fifo_top('test')")
+admin("lua box.delete(0, 'test')")
+admin("lua fifo_top('test')")
+admin("lua box.delete(0, 'test')")
+admin("lua for k,v in pairs(box.cfg) do print(' - ', k, ': ', v) end")
+admin("lua for k,v in pairs(box.space[0]) do if type(v) ~= 'table' then print(' - ', k, ': ', v) end end")
+admin("reload configuration")
+admin("lua for k,v in pairs(box.cfg) do print(' - ', k, ': ', v) end")
+admin("lua for k,v in pairs(box.space[0]) do if type(v) ~= 'table' then print(' - ', k, ': ', v) end end")
# must be read-only
-exec admin "lua box.cfg.nosuchoption = 1"
-exec admin "lua box.space[300] = 1"
-
-exec admin "lua box.index.new('abc', 'cde')"
-exec admin "lua box.index.new(1, 2)"
-exec admin "lua box.index.new(0, 1)"
-exec admin "lua box.index.new(0, 0)"
-exec admin "lua #box.index.new(0,0)"
-exec admin "lua #box.space[0].index[0].idx"
-exec admin "lua box.insert(0, 'test')"
-exec admin "lua box.insert(0, 'abcd')"
-exec admin "lua #box.index.new(0,0)"
-exec admin "lua #box.space[0].index[0].idx"
-exec admin "lua box.delete(0, 'test')"
-exec admin "lua #box.index.new(0,0)"
-exec admin "lua box.delete(0, 'abcd')"
-exec admin "lua #box.space[0].index[0].idx"
-exec admin "lua #box.index.new(0,0)"
-exec admin "lua box.space[0]:insert('test', 'hello world')"
-exec admin "lua box.space[0]:update('test', '=p', 1, 'bye, world')"
-exec admin "lua box.space[0]:delete('test')"
+admin("lua box.cfg.nosuchoption = 1")
+admin("lua box.space[300] = 1")
+
+admin("lua box.index.new('abc', 'cde')")
+admin("lua box.index.new(1, 2)")
+admin("lua box.index.new(0, 1)")
+admin("lua box.index.new(0, 0)")
+admin("lua #box.index.new(0,0)")
+admin("lua #box.space[0].index[0].idx")
+admin("lua box.insert(0, 'test')")
+admin("lua box.insert(0, 'abcd')")
+admin("lua #box.index.new(0,0)")
+admin("lua #box.space[0].index[0].idx")
+admin("lua box.delete(0, 'test')")
+admin("lua #box.index.new(0,0)")
+admin("lua box.delete(0, 'abcd')")
+admin("lua #box.space[0].index[0].idx")
+admin("lua #box.index.new(0,0)")
+admin("lua box.space[0]:insert('test', 'hello world')")
+admin("lua box.space[0]:update('test', '=p', 1, 'bye, world')")
+admin("lua box.space[0]:delete('test')")
# test tuple iterators
-exec admin "lua t=box.space[0]:insert('test')"
-exec admin "lua t:next('abcd')"
-exec admin "lua t:next(1)"
-exec admin "lua t:next(t)"
-exec admin "lua t:next(t:next())"
-exec admin "lua for k, v in t:pairs() do print(v) end"
-exec admin "lua t=box.space[0]:replace('test', 'another field')"
-exec admin "lua for k, v in t:pairs() do print(v) end"
-exec admin "lua t=box.space[0]:replace('test', 'another field', 'one more')"
-exec admin "lua for k, v in t:pairs() do print(v) end"
-exec admin "lua t=box.tuple.new({'a', 'b', 'c', 'd'})"
-exec admin "lua for it,field in t:pairs() do print(field); end"
-exec admin "lua it, field = t:next()"
-exec admin "lua getmetatable(it)"
-exec admin "lua box.space[0]:truncate()"
-exec admin "lua box.fiber.sleep(0)"
-exec admin "lua box.fiber.sleep(0.01)"
-exec admin "lua box.fiber.sleep(0.0001)"
-exec admin "lua box.fiber.sleep('hello')"
-exec admin "lua box.fiber.sleep(box, 0.001)"
-exec admin "lua box.fiber.cancel(box.fiber.self())"
-exec admin "lua f = box.fiber.self()"
-exec admin "lua old_id = f:id()"
-exec admin "lua box.fiber.cancel(f)"
-exec admin "lua box.fiber.self():id() - old_id < 3"
-exec admin "lua box.fiber.cancel(box.fiber.self())"
-exec admin "lua box.fiber.self():id() - old_id < 5"
-exec admin "lua g = box.fiber.self()"
-exec admin "lua f==g"
-exec admin "lua function r() f = box.fiber.create(r) return (box.fiber.resume(f)) end"
-exec admin "lua r()"
-exec admin "lua f = box.fiber.create(print('hello')"
-exec admin "lua box.fiber.resume(f)"
+admin("lua t=box.space[0]:insert('test')")
+admin("lua t:next('abcd')")
+admin("lua t:next(1)")
+admin("lua t:next(t)")
+admin("lua t:next(t:next())")
+admin("lua for k, v in t:pairs() do print(v) end")
+admin("lua t=box.space[0]:replace('test', 'another field')")
+admin("lua for k, v in t:pairs() do print(v) end")
+admin("lua t=box.space[0]:replace('test', 'another field', 'one more')")
+admin("lua for k, v in t:pairs() do print(v) end")
+admin("lua t=box.tuple.new({'a', 'b', 'c', 'd'})")
+admin("lua for it,field in t:pairs() do print(field); end")
+admin("lua it, field = t:next()")
+admin("lua getmetatable(it)")
+admin("lua box.space[0]:truncate()")
+admin("lua box.fiber.sleep(0)")
+admin("lua box.fiber.sleep(0.01)")
+admin("lua box.fiber.sleep(0.0001)")
+admin("lua box.fiber.sleep('hello')")
+admin("lua box.fiber.sleep(box, 0.001)")
+admin("lua box.fiber.cancel(box.fiber.self())")
+admin("lua f = box.fiber.self()")
+admin("lua old_id = f:id()")
+admin("lua box.fiber.cancel(f)")
+admin("lua box.fiber.self():id() - old_id < 3")
+admin("lua box.fiber.cancel(box.fiber.self())")
+admin("lua box.fiber.self():id() - old_id < 5")
+admin("lua g = box.fiber.self()")
+admin("lua f==g")
+admin("lua function r() f = box.fiber.create(r) return (box.fiber.resume(f)) end")
+admin("lua r()")
+admin("lua f = box.fiber.create(print('hello')")
+admin("lua box.fiber.resume(f)")
# test passing arguments in and out created fiber
-exec admin "lua function r(a, b) print(a) print(b) return a, b end"
-exec admin "lua f=box.fiber.create(r)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua f=box.fiber.create(r)"
-exec admin "lua box.fiber.resume(f, 'hello')"
-exec admin "lua f=box.fiber.create(r)"
-exec admin "lua box.fiber.resume(f, 'hello', 'world')"
-exec admin "lua f=box.fiber.create(r)"
-exec admin "lua box.fiber.resume(f, 'hello', 'world', 'wide')"
-exec admin "lua function y(a, b) c=box.fiber.yield(a) return box.fiber.yield(b, c) end"
-exec admin "lua f=box.fiber.create(y)"
-exec admin "lua box.fiber.resume(f, 'hello', 'world')"
-exec admin "lua box.fiber.resume(f, 'wide')"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua function y() print('started') box.fiber.detach() while true do box.replace(0, 'test', os.time()) box.fiber.sleep(0.001) end end"
-exec admin "lua f = box.fiber.create(y)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua box.fiber.sleep(0.002)"
-exec admin "lua box.fiber.cancel(f)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua f=nil"
-exec admin "lua for k=1, 10000, 1 do box.fiber.create(function() box.fiber.detach() end) end"
-exec admin "lua collectgarbage('collect')"
+admin("lua function r(a, b) print(a) print(b) return a, b end")
+admin("lua f=box.fiber.create(r)")
+admin("lua box.fiber.resume(f)")
+admin("lua f=box.fiber.create(r)")
+admin("lua box.fiber.resume(f, 'hello')")
+admin("lua f=box.fiber.create(r)")
+admin("lua box.fiber.resume(f, 'hello', 'world')")
+admin("lua f=box.fiber.create(r)")
+admin("lua box.fiber.resume(f, 'hello', 'world', 'wide')")
+admin("lua function y(a, b) c=box.fiber.yield(a) return box.fiber.yield(b, c) end")
+admin("lua f=box.fiber.create(y)")
+admin("lua box.fiber.resume(f, 'hello', 'world')")
+admin("lua box.fiber.resume(f, 'wide')")
+admin("lua box.fiber.resume(f)")
+admin("lua function y() print('started') box.fiber.detach() while true do box.replace(0, 'test', os.time()) box.fiber.sleep(0.001) end end")
+admin("lua f = box.fiber.create(y)")
+admin("lua box.fiber.resume(f)")
+admin("lua box.fiber.sleep(0.002)")
+admin("lua box.fiber.cancel(f)")
+admin("lua box.fiber.resume(f)")
+admin("lua f=nil")
+admin("lua for k=1, 10000, 1 do box.fiber.create(function() box.fiber.detach() end) end")
+admin("lua collectgarbage('collect')")
# check that these newly created fibers are garbage collected
-exec admin "lua box.fiber.find(900)"
-exec admin "lua box.fiber.find(910)"
-exec admin "lua box.fiber.find(920)"
+admin("lua box.fiber.find(900)")
+admin("lua box.fiber.find(910)")
+admin("lua box.fiber.find(920)")
#
# Test box.fiber.wrap()
@@ -222,73 +222,73 @@ exec admin "lua box.fiber.find(920)"
# but hit the fiber stack size limit and fail
# with an error.
#
-exec admin "lua f = function() box.fiber.wrap(f) end"
-exec sql "call f()"
+admin("lua f = function() box.fiber.wrap(f) end")
+sql("call f()")
#
# Test argument passing
#
-exec admin "lua f = function(a, b) box.fiber.wrap(function(arg) result = arg end, a..b) end"
-exec admin "lua f('hello ', 'world')"
-exec admin "lua result"
-exec admin "lua f('bye ', 'world')"
-exec admin "lua result"
+admin("lua f = function(a, b) box.fiber.wrap(function(arg) result = arg end, a..b) end")
+admin("lua f('hello ', 'world')")
+admin("lua result")
+admin("lua f('bye ', 'world')")
+admin("lua result")
#
# Test that the created fiber is detached
#
-exec admin "lua box.fiber.wrap(function() result = box.fiber.status() end)"
-exec admin "lua result"
+admin("lua box.fiber.wrap(function() result = box.fiber.status() end)")
+admin("lua result")
#
#
print """# A test case for Bug#933487
# tarantool crashed during shutdown if non running LUA fiber
# was created
#"""
-exec admin "lua f = box.fiber.create(function () return true end)"
-exec admin "save snapshot"
-exec admin "save snapshot"
-exec admin "save snapshot"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua f = box.fiber.create(function () return true end)"
+admin("lua f = box.fiber.create(function () return true end)")
+admin("save snapshot")
+admin("save snapshot")
+admin("save snapshot")
+admin("lua box.fiber.resume(f)")
+admin("lua f = box.fiber.create(function () return true end)")
#
#
print """#
#
#"""
-exec admin "lua box.space[0]:insert('test', 'something to splice')"
-exec admin "lua box.space[0]:update('test', ':p', 1, box.pack('ppp', 0, 4, 'no'))"
-exec admin "lua box.space[0]:update('test', ':p', 1, box.pack('ppp', 0, 2, 'every'))"
+admin("lua box.space[0]:insert('test', 'something to splice')")
+admin("lua box.space[0]:update('test', ':p', 1, box.pack('ppp', 0, 4, 'no'))")
+admin("lua box.space[0]:update('test', ':p', 1, box.pack('ppp', 0, 2, 'every'))")
# check an incorrect offset
-exec admin "lua box.space[0]:update('test', ':p', 1, box.pack('ppp', 100, 2, 'every'))"
-exec admin "lua box.space[0]:update('test', ':p', 1, box.pack('ppp', -100, 2, 'every'))"
-exec admin "lua box.space[0]:truncate()"
-exec admin "lua box.space[0]:insert('test', 'hello', 'october', '20th'):unpack()"
-exec admin "lua box.space[0]:truncate()"
+admin("lua box.space[0]:update('test', ':p', 1, box.pack('ppp', 100, 2, 'every'))")
+admin("lua box.space[0]:update('test', ':p', 1, box.pack('ppp', -100, 2, 'every'))")
+admin("lua box.space[0]:truncate()")
+admin("lua box.space[0]:insert('test', 'hello', 'october', '20th'):unpack()")
+admin("lua box.space[0]:truncate()")
# check how well we can return tables
-exec admin "lua function f1(...) return {...} end"
-exec admin "lua function f2(...) return f1({...}) end"
-exec sql "call f1('test_', 'test_')"
-exec sql "call f2('test_', 'test_')"
-exec sql "call f1()"
-exec sql "call f2()"
+admin("lua function f1(...) return {...} end")
+admin("lua function f2(...) return f1({...}) end")
+sql("call f1('test_', 'test_')")
+sql("call f2('test_', 'test_')")
+sql("call f1()")
+sql("call f2()")
# check multi-tuple return
-exec admin "lua function f3() return {{'hello'}, {'world'}} end"
-exec sql "call f3()"
-exec admin "lua function f3() return {'hello', {'world'}} end"
-exec sql "call f3()"
-exec admin "lua function f3() return 'hello', {{'world'}, {'canada'}} end"
-exec sql "call f3()"
-exec admin "lua function f3() return {}, '123', {{}, {}} end"
-exec sql "call f3()"
-exec admin "lua function f3() return { {{'hello'}} } end"
-exec sql "call f3()"
-exec admin "lua function f3() return { box.tuple.new('hello'), {'world'} } end"
-exec sql "call f3()"
-exec admin "lua function f3() return { {'world'}, box.tuple.new('hello') } end"
-exec sql "call f3()"
-
-exec sql "call f1('jason')"
-exec sql "call f1('jason', 1, 'test', 2, 'stewart')"
+admin("lua function f3() return {{'hello'}, {'world'}} end")
+sql("call f3()")
+admin("lua function f3() return {'hello', {'world'}} end")
+sql("call f3()")
+admin("lua function f3() return 'hello', {{'world'}, {'canada'}} end")
+sql("call f3()")
+admin("lua function f3() return {}, '123', {{}, {}} end")
+sql("call f3()")
+admin("lua function f3() return { {{'hello'}} } end")
+sql("call f3()")
+admin("lua function f3() return { box.tuple.new('hello'), {'world'} } end")
+sql("call f3()")
+admin("lua function f3() return { {'world'}, box.tuple.new('hello') } end")
+sql("call f3()")
+
+sql("call f1('jason')")
+sql("call f1('jason', 1, 'test', 2, 'stewart')")
lua = """
function box.crossjoin(space0, space1, limit)
space0 = tonumber(space0)
@@ -308,33 +308,33 @@ function box.crossjoin(space0, space1, limit)
end
return unpack(result)
end"""
-exec admin "lua " + lua.replace('\n', ' ')
-exec admin "lua box.crossjoin(0, 0, 0)"
-exec admin "lua box.crossjoin(0, 0, 10000)"
-exec admin "lua box.space[0]:insert(1)"
-exec sql "call box.crossjoin('0', '0', '10000')"
-exec admin "lua box.space[0]:insert(2)"
-exec sql "call box.crossjoin('0', '0', '10000')"
-exec admin "lua box.space[0]:insert(3, 'hello')"
-exec sql "call box.crossjoin('0', '0', '10000')"
-exec admin "lua box.space[0]:insert(4, 'world')"
-exec admin "lua box.space[0]:insert(5, 'hello world')"
-exec sql "call box.crossjoin('0', '0', '10000')"
-exec admin "lua box.space[0]:truncate()"
-exec admin "lua box.crossjoin = nil"
+admin("lua " + lua.replace('\n', ' '))
+admin("lua box.crossjoin(0, 0, 0)")
+admin("lua box.crossjoin(0, 0, 10000)")
+admin("lua box.space[0]:insert(1)")
+sql("call box.crossjoin('0', '0', '10000')")
+admin("lua box.space[0]:insert(2)")
+sql("call box.crossjoin('0', '0', '10000')")
+admin("lua box.space[0]:insert(3, 'hello')")
+sql("call box.crossjoin('0', '0', '10000')")
+admin("lua box.space[0]:insert(4, 'world')")
+admin("lua box.space[0]:insert(5, 'hello world')")
+sql("call box.crossjoin('0', '0', '10000')")
+admin("lua box.space[0]:truncate()")
+admin("lua box.crossjoin = nil")
print """
# A test case for Bug#901674
# No way to inspect exceptions from Box in Lua
"""
-exec admin "lua pcall(box.insert, 99, 1, 'test')"
-exec admin "lua pcall(box.insert, 0, 1, 'hello')"
-exec admin "lua pcall(box.insert, 0, 1, 'hello')"
-exec admin "lua box.space[0]:truncate()"
+admin("lua pcall(box.insert, 99, 1, 'test')")
+admin("lua pcall(box.insert, 0, 1, 'hello')")
+admin("lua pcall(box.insert, 0, 1, 'hello')")
+admin("lua box.space[0]:truncate()")
print """
# A test case for Bug#908094
# Lua provides access to os.execute()
"""
-exec admin "lua os.execute('ls')"
+admin("lua os.execute('ls')")
print """
@@ -346,94 +346,94 @@ print """
box_fiber_lua = os.path.abspath("box/box_fiber.lua")
# don't log the path name
sys.stdout.push_filter("lua dofile(.*)", "lua dofile(...)")
-exec admin "lua dofile('{0}')".format(box_fiber_lua)
+admin("lua dofile('{0}')".format(box_fiber_lua))
sys.stdout.pop_filter()
print """
# test box.fiber.status functions: invalid arguments
"""
-exec admin "lua box.fiber.status(1)"
-exec admin "lua box.fiber.status('fafa-gaga')"
-exec admin "lua box.fiber.status(nil)"
+admin("lua box.fiber.status(1)")
+admin("lua box.fiber.status('fafa-gaga')")
+admin("lua box.fiber.status(nil)")
print """
# run fiber's test
"""
-exec admin "lua box_fiber_run_test()"
+admin("lua box_fiber_run_test()")
# Testing 64bit
-exec admin "lua tonumber64(123)"
-exec admin "lua tonumber64('123')"
-exec admin "lua type(tonumber64('123')) == 'cdata'"
-exec admin "lua tonumber64('9223372036854775807') == tonumber64('9223372036854775807')"
-exec admin "lua tonumber64('9223372036854775807') - tonumber64('9223372036854775800')"
-exec admin "lua tonumber64('18446744073709551615') == tonumber64('18446744073709551615')"
-exec admin "lua tonumber64('18446744073709551615') + 1"
-exec admin "lua tonumber64(-1)"
-exec admin "lua tonumber64('184467440737095516155')"
-exec admin "lua string.byte(box.pack('p', tonumber64(123)))"
+admin("lua tonumber64(123)")
+admin("lua tonumber64('123')")
+admin("lua type(tonumber64('123')) == 'cdata'")
+admin("lua tonumber64('9223372036854775807') == tonumber64('9223372036854775807')")
+admin("lua tonumber64('9223372036854775807') - tonumber64('9223372036854775800')")
+admin("lua tonumber64('18446744073709551615') == tonumber64('18446744073709551615')")
+admin("lua tonumber64('18446744073709551615') + 1")
+admin("lua tonumber64(-1)")
+admin("lua tonumber64('184467440737095516155')")
+admin("lua string.byte(box.pack('p', tonumber64(123)))")
# test delete field
-exec admin "lua box.space[0]:truncate()"
-exec sql "call box.insert('0', 'tes1', 'tes2', 'tes3', 'tes4', 'tes5')"
-exec sql "call box.update('0', 'tes1', '#p', 0, '')"
-exec sql "call box.update('0', 'tes2', '#p', 0, '')"
-exec sql "call box.update('0', 'tes3', '#p', 0, '')"
-exec sql "call box.update('0', 'tes4', '#p', 0, '')"
-exec admin "lua box.update(0, 'tes5', '#p', 0, '')"
-exec admin "lua box.space[0]:truncate()"
+admin("lua box.space[0]:truncate()")
+sql("call box.insert('0', 'tes1', 'tes2', 'tes3', 'tes4', 'tes5')")
+sql("call box.update('0', 'tes1', '#p', 0, '')")
+sql("call box.update('0', 'tes2', '#p', 0, '')")
+sql("call box.update('0', 'tes3', '#p', 0, '')")
+sql("call box.update('0', 'tes4', '#p', 0, '')")
+admin("lua box.update(0, 'tes5', '#p', 0, '')")
+admin("lua box.space[0]:truncate()")
print """
# test box.update: INSERT field
"""
-exec admin "lua box.insert(0, 1, 3, 6, 9)"
-exec admin "lua box.update(0, 1, '!p', 1, 2)"
-exec admin "lua box.update(0, 1, '!p!p!p!p', 3, 4, 3, 5, 4, 7, 4, 8)"
-exec admin "lua box.update(0, 1, '!p!p!p', 9, 10, 9, 11, 9, 12)"
-exec admin "lua box.space[0]:truncate()"
-exec admin "lua box.insert(0, 1, 'tuple')"
-exec admin "lua box.update(0, 1, '#p!p=p', 1, '', 1, 'inserted tuple', 2, 'set tuple')"
-exec admin "lua box.space[0]:truncate()"
-exec admin "lua box.insert(0, 1, 'tuple')"
-exec admin "lua box.update(0, 1, '=p!p#p', 1, 'set tuple', 1, 'inerted tuple', 2, '')"
-exec admin "lua box.update(0, 1, '!p!p', 0, 3, 0, 2)"
-exec admin "lua box.space[0]:truncate()"
+admin("lua box.insert(0, 1, 3, 6, 9)")
+admin("lua box.update(0, 1, '!p', 1, 2)")
+admin("lua box.update(0, 1, '!p!p!p!p', 3, 4, 3, 5, 4, 7, 4, 8)")
+admin("lua box.update(0, 1, '!p!p!p', 9, 10, 9, 11, 9, 12)")
+admin("lua box.space[0]:truncate()")
+admin("lua box.insert(0, 1, 'tuple')")
+admin("lua box.update(0, 1, '#p!p=p', 1, '', 1, 'inserted tuple', 2, 'set tuple')")
+admin("lua box.space[0]:truncate()")
+admin("lua box.insert(0, 1, 'tuple')")
+admin("lua box.update(0, 1, '=p!p#p', 1, 'set tuple', 1, 'inerted tuple', 2, '')")
+admin("lua box.update(0, 1, '!p!p', 0, 3, 0, 2)")
+admin("lua box.space[0]:truncate()")
print """
# Test for Bug #955226
# Lua Numbers are passed back wrongly as strings
#
"""
-exec admin "lua function foo() return 1, 2, '1', '2' end"
-exec sql "call foo()"
+admin("lua function foo() return 1, 2, '1', '2' end")
+sql("call foo()")
print """
# test update's assign opearations
"""
-exec admin "lua box.replace(0, 1, 'field string value')"
-exec admin "lua box.update(0, 1, '=p=p=p', 1, 'new field string value', 2, 42, 3, 0xdeadbeef)"
+admin("lua box.replace(0, 1, 'field string value')")
+admin("lua box.update(0, 1, '=p=p=p', 1, 'new field string value', 2, 42, 3, 0xdeadbeef)")
print """
# test update's arith opearations
"""
-exec admin "lua box.update(0, 1, '+p&p|p^p', 2, 16, 3, 0xffff0000, 3, 0x0000a0a0, 3, 0xffff00aa)"
+admin("lua box.update(0, 1, '+p&p|p^p', 2, 16, 3, 0xffff0000, 3, 0x0000a0a0, 3, 0xffff00aa)")
print """
# test update splice operation
"""
-exec admin "lua ops_list = {}"
-exec admin "lua table.insert(ops_list, box.upd.splice(1, 0, 3, 'the newest'))"
-exec admin "lua box.update(0, 1, ':p', 1, box.pack('ppp', 0, 3, 'the newest'))"
+admin("lua ops_list = {}")
+admin("lua table.insert(ops_list, box.upd.splice(1, 0, 3, 'the newest'))")
+admin("lua box.update(0, 1, ':p', 1, box.pack('ppp', 0, 3, 'the newest'))")
print """
# test update delete operations
"""
-exec admin "lua box.update(0, 1, '#p#p', 3, '', 2, '')"
+admin("lua box.update(0, 1, '#p#p', 3, '', 2, '')")
print """
# test update insert operations
"""
-exec admin "lua box.update(0, 1, '!p!p!p!p', 1, 1, 1, 2, 1, 3, 1, 4)"
+admin("lua box.update(0, 1, '!p!p!p!p', 1, 1, 1, 2, 1, 3, 1, 4)")
-exec admin "lua box.space[0]:truncate()"
+admin("lua box.space[0]:truncate()")
print """
@@ -442,7 +442,7 @@ print """
#
"""
-exec admin "lua ffi"
+admin("lua ffi")
print """
@@ -460,27 +460,27 @@ server.deploy(init_lua="box/test_init.lua")
print """
# Test asscess to box configuration
"""
-exec admin "lua print_config()"
+admin("lua print_config()")
print """
# Test bug #977898
"""
# Run a dummy insert to avoid race conditions under valgrind
-exec admin "lua box.insert(0, 4, 8, 16)"
+admin("lua box.insert(0, 4, 8, 16)")
print """
# Test insert from init.lua
"""
-exec admin "lua box.select(0, 0, 1)"
-exec admin "lua box.select(0, 0, 2)"
-exec admin "lua box.select(0, 0, 4)"
+admin("lua box.select(0, 0, 1)")
+admin("lua box.select(0, 0, 2)")
+admin("lua box.select(0, 0, 4)")
print """
# Test bug #1002272
"""
-exec admin "lua floor(0.5)"
-exec admin "lua floor(0.9)"
-exec admin "lua floor(1.1)"
+admin("lua floor(0.5)")
+admin("lua floor(0.9)")
+admin("lua floor(1.1)")
print """
# clean-up after tests
@@ -490,195 +490,195 @@ server.deploy(init_lua=None)
print """
# Test box.tuple:slice()
"""
-exec admin "lua t=box.tuple.new({'0', '1', '2', '3', '4', '5', '6', '7'})"
-exec admin "lua t:slice(0)"
-exec admin "lua t:slice(-1)"
-exec admin "lua t:slice(1)"
-exec admin "lua t:slice(-1, -1)"
-exec admin "lua t:slice(-1, 1)"
-exec admin "lua t:slice(1, -1)"
-exec admin "lua t:slice(1, 3)"
-exec admin "lua t:slice(7)"
-exec admin "lua t:slice(8)"
-exec admin "lua t:slice(9)"
-exec admin "lua t:slice(100500)"
-exec admin "lua t:slice(9, -1)"
-exec admin "lua t:slice(6, -1)"
-exec admin "lua t:slice(4, 4)"
-exec admin "lua t:slice(6, 4)"
-exec admin "lua t:slice(0, 0)"
-exec admin "lua t:slice(9, 10)"
-exec admin "lua t:slice(-7)"
-exec admin "lua t:slice(-8)"
-exec admin "lua t:slice(-9)"
-exec admin "lua t:slice(-100500)"
-exec admin "lua t:slice(500, 700)"
-exec admin "lua box.space[0]:truncate()"
+admin("lua t=box.tuple.new({'0', '1', '2', '3', '4', '5', '6', '7'})")
+admin("lua t:slice(0)")
+admin("lua t:slice(-1)")
+admin("lua t:slice(1)")
+admin("lua t:slice(-1, -1)")
+admin("lua t:slice(-1, 1)")
+admin("lua t:slice(1, -1)")
+admin("lua t:slice(1, 3)")
+admin("lua t:slice(7)")
+admin("lua t:slice(8)")
+admin("lua t:slice(9)")
+admin("lua t:slice(100500)")
+admin("lua t:slice(9, -1)")
+admin("lua t:slice(6, -1)")
+admin("lua t:slice(4, 4)")
+admin("lua t:slice(6, 4)")
+admin("lua t:slice(0, 0)")
+admin("lua t:slice(9, 10)")
+admin("lua t:slice(-7)")
+admin("lua t:slice(-8)")
+admin("lua t:slice(-9)")
+admin("lua t:slice(-100500)")
+admin("lua t:slice(500, 700)")
+admin("lua box.space[0]:truncate()")
print """
# A test case for Bug#911641 box.fiber.sleep() works incorrectly if
# a fiber is attached.
"""
-exec admin "lua function r() return box.fiber.sleep(0.01) end"
-exec admin "lua f = box.fiber.create(r)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua function r() box.fiber.yield(box.space[0]:insert(0, 0, 1)) box.fiber.yield(box.space[0]:select(0, 0)) box.fiber.yield(box.space[0]:truncate()) end"
-exec admin "lua f = box.fiber.create(r)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua function r() return box.fiber.yield(box.fiber.create(r)) end"
-exec admin "lua f = r()"
-exec admin "lua f1 = box.fiber.resume(f)"
-exec admin "lua f2 = box.fiber.resume(f1)"
-exec admin "lua f3 = box.fiber.resume(f2)"
-exec admin "lua f4 = box.fiber.resume(f3)"
-exec admin "lua f5 = box.fiber.resume(f4)"
-exec admin "lua f6 = box.fiber.resume(f5)"
-exec admin "lua f7 = box.fiber.resume(f6)"
-exec admin "lua f8 = box.fiber.resume(f7)"
-exec admin "lua f9 = box.fiber.resume(f8)"
-exec admin "lua f10 = box.fiber.resume(f9)"
-exec admin "lua f11 = box.fiber.resume(f10)"
-exec admin "lua f12 = box.fiber.resume(f11)"
-exec admin "lua f13 = box.fiber.resume(f12)"
-exec admin "lua f14 = box.fiber.resume(f13)"
-exec admin "lua f15 = box.fiber.resume(f14)"
-exec admin "lua f16 = box.fiber.resume(f15)"
-exec admin "lua f17 = box.fiber.resume(f16)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua box.fiber.resume(f1)"
-exec admin "lua box.fiber.resume(f2)"
-exec admin "lua box.fiber.resume(f3)"
-exec admin "lua box.fiber.resume(f4)"
-exec admin "lua box.fiber.resume(f5)"
-exec admin "lua box.fiber.resume(f6)"
-exec admin "lua box.fiber.resume(f7)"
-exec admin "lua box.fiber.resume(f8)"
-exec admin "lua box.fiber.resume(f9)"
-exec admin "lua box.fiber.resume(f10)"
-exec admin "lua box.fiber.resume(f11)"
-exec admin "lua box.fiber.resume(f12)"
-exec admin "lua box.fiber.resume(f13)"
-exec admin "lua box.fiber.resume(f14)"
-exec admin "lua box.fiber.resume(f15)"
-exec admin "lua box.fiber.resume(f16)"
-exec admin "lua f17 = nil"
-exec admin "lua function r() box.fiber.detach() box.fiber.sleep(1000) end"
-exec admin "lua f = box.fiber.create(r)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua box.fiber.cancel(f)"
-exec admin "lua box.fiber.resume(f)"
+admin("lua function r() return box.fiber.sleep(0.01) end")
+admin("lua f = box.fiber.create(r)")
+admin("lua box.fiber.resume(f)")
+admin("lua box.fiber.resume(f)")
+admin("lua function r() box.fiber.yield(box.space[0]:insert(0, 0, 1)) box.fiber.yield(box.space[0]:select(0, 0)) box.fiber.yield(box.space[0]:truncate()) end")
+admin("lua f = box.fiber.create(r)")
+admin("lua box.fiber.resume(f)")
+admin("lua box.fiber.resume(f)")
+admin("lua box.fiber.resume(f)")
+admin("lua box.fiber.resume(f)")
+admin("lua function r() return box.fiber.yield(box.fiber.create(r)) end")
+admin("lua f = r()")
+admin("lua f1 = box.fiber.resume(f)")
+admin("lua f2 = box.fiber.resume(f1)")
+admin("lua f3 = box.fiber.resume(f2)")
+admin("lua f4 = box.fiber.resume(f3)")
+admin("lua f5 = box.fiber.resume(f4)")
+admin("lua f6 = box.fiber.resume(f5)")
+admin("lua f7 = box.fiber.resume(f6)")
+admin("lua f8 = box.fiber.resume(f7)")
+admin("lua f9 = box.fiber.resume(f8)")
+admin("lua f10 = box.fiber.resume(f9)")
+admin("lua f11 = box.fiber.resume(f10)")
+admin("lua f12 = box.fiber.resume(f11)")
+admin("lua f13 = box.fiber.resume(f12)")
+admin("lua f14 = box.fiber.resume(f13)")
+admin("lua f15 = box.fiber.resume(f14)")
+admin("lua f16 = box.fiber.resume(f15)")
+admin("lua f17 = box.fiber.resume(f16)")
+admin("lua box.fiber.resume(f)")
+admin("lua box.fiber.resume(f1)")
+admin("lua box.fiber.resume(f2)")
+admin("lua box.fiber.resume(f3)")
+admin("lua box.fiber.resume(f4)")
+admin("lua box.fiber.resume(f5)")
+admin("lua box.fiber.resume(f6)")
+admin("lua box.fiber.resume(f7)")
+admin("lua box.fiber.resume(f8)")
+admin("lua box.fiber.resume(f9)")
+admin("lua box.fiber.resume(f10)")
+admin("lua box.fiber.resume(f11)")
+admin("lua box.fiber.resume(f12)")
+admin("lua box.fiber.resume(f13)")
+admin("lua box.fiber.resume(f14)")
+admin("lua box.fiber.resume(f15)")
+admin("lua box.fiber.resume(f16)")
+admin("lua f17 = nil")
+admin("lua function r() box.fiber.detach() box.fiber.sleep(1000) end")
+admin("lua f = box.fiber.create(r)")
+admin("lua box.fiber.resume(f)")
+admin("lua box.fiber.resume(f)")
+admin("lua box.fiber.cancel(f)")
+admin("lua box.fiber.resume(f)")
print """
# A test case for Bug#103491
# server CALL processing bug with name path longer than two
# https://bugs.launchpad.net/tarantool/+bug/1034912
"""
-exec admin "lua f = function() return 'OK' end"
-exec admin "lua test = {}"
-exec admin "lua test.f = f"
-exec admin "lua test.test = {}"
-exec admin "lua test.test.f = f"
-exec sql "call f()"
-exec sql "call test.f()"
-exec sql "call test.test.f()"
+admin("lua f = function() return 'OK' end")
+admin("lua test = {}")
+admin("lua test.f = f")
+admin("lua test.test = {}")
+admin("lua test.test.f = f")
+sql("call f()")
+sql("call test.f()")
+sql("call test.test.f()")
print """
# A test case for box.counter
"""
-exec admin "lua box.counter.inc(0, 1)"
-exec admin "lua box.select(0, 0, 1)"
-exec admin "lua box.counter.inc(0, 1)"
-exec admin "lua box.counter.inc(0, 1)"
-exec admin "lua box.select(0, 0, 1)"
-exec admin "lua box.counter.dec(0, 1)"
-exec admin "lua box.counter.dec(0, 1)"
-exec admin "lua box.select(0, 0, 1)"
-exec admin "lua box.counter.dec(0, 1)"
-exec admin "lua box.select(0, 0, 1)"
+admin("lua box.counter.inc(0, 1)")
+admin("lua box.select(0, 0, 1)")
+admin("lua box.counter.inc(0, 1)")
+admin("lua box.counter.inc(0, 1)")
+admin("lua box.select(0, 0, 1)")
+admin("lua box.counter.dec(0, 1)")
+admin("lua box.counter.dec(0, 1)")
+admin("lua box.select(0, 0, 1)")
+admin("lua box.counter.dec(0, 1)")
+admin("lua box.select(0, 0, 1)")
print """# box.dostring()"""
-exec admin "lua box.dostring('abc')"
-exec admin "lua box.dostring('abc=2')"
-exec admin "lua box.dostring('return abc')"
-exec admin "lua box.dostring('return ...', 1, 2, 3)"
+admin("lua box.dostring('abc')")
+admin("lua box.dostring('abc=2')")
+admin("lua box.dostring('return abc')")
+admin("lua box.dostring('return ...', 1, 2, 3)")
print """# box.update: push/pop fields"""
-exec admin "lua box.insert(0, 'abcd')"
-exec admin "lua box.update(0, 'abcd', '#p', 1, '')"
-exec admin "lua box.update(0, 'abcd', '=p', -1, 'push1')"
-exec admin "lua box.update(0, 'abcd', '=p', -1, 'push2')"
-exec admin "lua box.update(0, 'abcd', '=p', -1, 'push3')"
-exec admin "lua box.update(0, 'abcd', '#p=p', 1, '', -1, 'swap1')"
-exec admin "lua box.update(0, 'abcd', '#p=p', 1, '', -1, 'swap2')"
-exec admin "lua box.update(0, 'abcd', '#p=p', 1, '', -1, 'swap3')"
-exec admin "lua box.update(0, 'abcd', '#p=p', -1, '', -1, 'noop1')"
-exec admin "lua box.update(0, 'abcd', '#p=p', -1, '', -1, 'noop2')"
-exec admin "lua box.update(0, 'abcd', '#p=p', -1, '', -1, 'noop3')"
-exec admin "lua box.space[0]:truncate()"
+admin("lua box.insert(0, 'abcd')")
+admin("lua box.update(0, 'abcd', '#p', 1, '')")
+admin("lua box.update(0, 'abcd', '=p', -1, 'push1')")
+admin("lua box.update(0, 'abcd', '=p', -1, 'push2')")
+admin("lua box.update(0, 'abcd', '=p', -1, 'push3')")
+admin("lua box.update(0, 'abcd', '#p=p', 1, '', -1, 'swap1')")
+admin("lua box.update(0, 'abcd', '#p=p', 1, '', -1, 'swap2')")
+admin("lua box.update(0, 'abcd', '#p=p', 1, '', -1, 'swap3')")
+admin("lua box.update(0, 'abcd', '#p=p', -1, '', -1, 'noop1')")
+admin("lua box.update(0, 'abcd', '#p=p', -1, '', -1, 'noop2')")
+admin("lua box.update(0, 'abcd', '#p=p', -1, '', -1, 'noop3')")
+admin("lua box.space[0]:truncate()")
print """# A test case for Bug#1043804 lua error() -> server crash"""
-exec admin "lua error()"
+admin("lua error()")
print """# Test box.fiber.name()"""
-exec admin "lua old_name = box.fiber.name()"
-exec admin "lua box.fiber.name() == old_name"
-exec admin "lua box.fiber.self():name() == old_name"
-exec admin "lua box.fiber.name('hello fiber')"
-exec admin "lua box.fiber.name()"
-exec admin "lua box.fiber.self():name('bye fiber')"
-exec admin "lua box.fiber.self():name()"
-exec admin "lua box.fiber.self():name(old_name)"
+admin("lua old_name = box.fiber.name()")
+admin("lua box.fiber.name() == old_name")
+admin("lua box.fiber.self():name() == old_name")
+admin("lua box.fiber.name('hello fiber')")
+admin("lua box.fiber.name()")
+admin("lua box.fiber.self():name('bye fiber')")
+admin("lua box.fiber.self():name()")
+admin("lua box.fiber.self():name(old_name)")
print """# A test case for bitwise operations """
-exec admin "lua bit.lshift(1, 32)"
-exec admin "lua bit.band(1, 3)"
-exec admin "lua bit.bor(1, 2)"
+admin("lua bit.lshift(1, 32)")
+admin("lua bit.band(1, 3)")
+admin("lua bit.bor(1, 2)")
print """# A test case for Bug#1061747 'tonumber64 is not transitive'"""
-exec admin "lua tonumber64(tonumber64(2))"
-exec admin "lua tostring(tonumber64(tonumber64(3)))"
+admin("lua tonumber64(tonumber64(2))")
+admin("lua tostring(tonumber64(tonumber64(3)))")
print """# box.tuple.new test"""
-exec admin "lua box.tuple.new()"
-exec admin "lua box.tuple.new(1)"
-exec admin "lua box.tuple.new('string')"
-exec admin "lua box.tuple.new(tonumber64('18446744073709551615'))"
-exec admin "lua box.tuple.new({tonumber64('18446744073709551615'), 'string', 1})"
+admin("lua box.tuple.new()")
+admin("lua box.tuple.new(1)")
+admin("lua box.tuple.new('string')")
+admin("lua box.tuple.new(tonumber64('18446744073709551615'))")
+admin("lua box.tuple.new({tonumber64('18446744073709551615'), 'string', 1})")
print """# A test case for the key as an tuple"""
-exec admin "lua t=box.insert(0, 777, '0', '1', '2', '3')"
-exec admin "lua t"
-exec admin "lua box.replace(0, t)"
-exec admin "lua box.replace(0, 777, { 'a', 'b', 'c', {'d', 'e', t}})"
+admin("lua t=box.insert(0, 777, '0', '1', '2', '3')")
+admin("lua t")
+admin("lua box.replace(0, t)")
+admin("lua box.replace(0, 777, { 'a', 'b', 'c', {'d', 'e', t}})")
print """# A test case for tuple:totable() method"""
-exec admin "lua t=box.select(0, 0, 777):totable()"
-exec admin "lua t[2], t[3], t[4], t[5]"
-exec admin "lua box.space[0]:truncate()"
+admin("lua t=box.select(0, 0, 777):totable()")
+admin("lua t[2], t[3], t[4], t[5]")
+admin("lua box.space[0]:truncate()")
print """# A test case for Bug#1119389 '(lbox_tuple_index) crashes on 'nil' argument'"""
-exec admin "lua t=box.insert(0, 8989)"
-exec admin "lua t[nil]"
+admin("lua t=box.insert(0, 8989)")
+admin("lua t[nil]")
print """# A test case for Bug#1131108 'tonumber64 from negative int inconsistency'"""
-exec admin "lua tonumber64(-1)"
-exec admin "lua tonumber64(-1LL)"
-exec admin "lua tonumber64(-1ULL)"
-exec admin "lua -1"
-exec admin "lua -1LL"
-exec admin "lua -1ULL"
-exec admin "lua tonumber64(-1.0)"
-exec admin "lua 6LL - 7LL"
+admin("lua tonumber64(-1)")
+admin("lua tonumber64(-1LL)")
+admin("lua tonumber64(-1ULL)")
+admin("lua -1")
+admin("lua -1LL")
+admin("lua -1ULL")
+admin("lua tonumber64(-1.0)")
+admin("lua 6LL - 7LL")
print """# A test case for Bug#1131108 'incorrect conversion from boolean lua value to tarantool tuple'
"""
-exec admin "lua function bug1075677() local range = {} table.insert(range, 1>0) return range end"
-exec sql "call bug1075677()"
-exec admin "lua bug1075677=nil"
-exec admin "lua box.tuple.new(false)"
-exec admin "lua box.tuple.new({false})"
+admin("lua function bug1075677() local range = {} table.insert(range, 1>0) return range end")
+sql("call bug1075677()")
+admin("lua bug1075677=nil")
+admin("lua box.tuple.new(false)")
+admin("lua box.tuple.new({false})")
-exec admin "lua t = box.tuple.new('abc')"
-exec admin "lua t"
-exec admin "lua t:bsize()"
-exec admin silent "lua box.delete(0, 8989)"
+admin("lua t = box.tuple.new('abc')")
+admin("lua t")
+admin("lua t:bsize()")
+admin("lua box.delete(0, 8989)", silent=True)
diff --git a/test/box/lua_box_uuid.skipcond b/test/box/lua_box_uuid.skipcond
index 139823105f..78c1534f92 100644
--- a/test/box/lua_box_uuid.skipcond
+++ b/test/box/lua_box_uuid.skipcond
@@ -1,11 +1,11 @@
-# encoding: tarantool
+# encoding: utf-8
import os
import sys
import re
-uuid = exec admin "lua box.uuid_hex()"
+uuid = admin("lua box.uuid_hex()")
if not re.search(re.compile('^\s+-\s+[a-f0-9]{32}\s*$', re.M), uuid):
if re.search('box.uuid\(\):', uuid):
diff --git a/test/box/lua_box_uuid.test b/test/box/lua_box_uuid.test
index 59d5c485a9..38b6471565 100644
--- a/test/box/lua_box_uuid.test
+++ b/test/box/lua_box_uuid.test
@@ -1,8 +1,8 @@
-# encoding: tarantool
+# encoding: utf-8
import os
import sys
print """# box.uuid()"""
-exec admin "lua string.len(box.uuid())"
-exec admin "lua string.len(box.uuid_hex())"
-exec admin "lua string.match(box.uuid_hex(), '^[a-f0-9]+$') ~= nil"
+admin("lua string.len(box.uuid())")
+admin("lua string.len(box.uuid_hex())")
+admin("lua string.match(box.uuid_hex(), '^[a-f0-9]+$') ~= nil")
diff --git a/test/box/lua_misc.test b/test/box/lua_misc.test
index 3f7ee6df24..f9ec4e0f2f 100644
--- a/test/box/lua_misc.test
+++ b/test/box/lua_misc.test
@@ -1,13 +1,13 @@
-# encoding: tarantool
+# encoding: utf-8
print """
#
# box.raise
#
"""
-exec admin "lua 1 + 1"
-exec admin "lua box.raise(123, 'test')"
-exec admin "lua box.raise(0, 'the other test')"
-exec admin "lua box.raise(12, 345)"
+admin("lua 1 + 1")
+admin("lua box.raise(123, 'test')")
+admin("lua box.raise(0, 'the other test')")
+admin("lua box.raise(12, 345)")
print """
#
@@ -15,9 +15,9 @@ print """
#
"""
-exec admin "lua for k, v in pairs(box.stat()) do print(k) end"
-exec admin "lua for k, v in pairs(box.stat().DELETE) do print(k) end"
-exec admin "lua for k, v in pairs(box.stat.DELETE) do print(k) end"
+admin("lua for k, v in pairs(box.stat()) do print(k) end")
+admin("lua for k, v in pairs(box.stat().DELETE) do print(k) end")
+admin("lua for k, v in pairs(box.stat.DELETE) do print(k) end")
print """
#
@@ -25,10 +25,10 @@ print """
#
"""
-exec admin "lua type(box)"
-exec admin "lua type(box.space)"
-exec admin "lua box.cfg.memcached_space"
-exec admin "lua for i, v in pairs(box.space[0].index[0].key_field[0]) do print(i, ': ', v) end"
+admin("lua type(box)")
+admin("lua type(box.space)")
+admin("lua box.cfg.memcached_space")
+admin("lua for i, v in pairs(box.space[0].index[0].key_field[0]) do print(i, ': ', v) end")
print """
#
@@ -36,15 +36,15 @@ print """
#
"""
-exec admin "lua string.match(tostring(box.slab), '^table:') ~= nil"
-exec admin "lua box.slab.arena_used >= 0"
-exec admin "lua box.slab.arena_size > 0"
-exec admin "lua string.match(tostring(box.slab.slabs), '^table:') ~= nil"
-exec admin "lua for k, v in pairs(box.slab()) do print(k) end"
+admin("lua string.match(tostring(box.slab), '^table:') ~= nil")
+admin("lua box.slab.arena_used >= 0")
+admin("lua box.slab.arena_size > 0")
+admin("lua string.match(tostring(box.slab.slabs), '^table:') ~= nil")
+admin("lua for k, v in pairs(box.slab()) do print(k) end")
print """
#
# box.error
#
"""
-exec admin "lua for k,v in pairs(box.error) do print('box.error.', k, ': ', v) end"
+admin("lua for k,v in pairs(box.error) do print('box.error.', k, ': ', v) end")
diff --git a/test/box/net.box.test b/test/box/net.box.test
index 711d3cbc06..a6810664a4 100644
--- a/test/box/net.box.test
+++ b/test/box/net.box.test
@@ -1,66 +1,66 @@
-# encoding: tarantool
+# encoding: utf-8
# vim: set ft=python :
-# exec admin "lua iotest()"
-# exec admin "lua iotest()"
-# exec admin "lua box.fiber.sleep(.5)"
+# admin("lua iotest()")
+# admin("lua iotest()")
+# admin("lua box.fiber.sleep(.5)")
-exec admin "lua remote = box.net.box.new('localhost', box.cfg.primary_port, '0.5')"
-exec admin "lua type(remote)"
-exec admin "lua remote:ping()"
-exec admin "lua remote:ping()"
-exec admin "lua box.net.box.ping(remote)"
-exec admin "lua box.insert(0, 123, 'test1', 'test2')"
-exec admin "lua box.select(0, 0, 123)"
-exec admin "lua tuple = remote:select(0, 0, 123)"
-exec admin "lua remote:call('box.select', '0', '0', 123)"
-exec admin "lua tuple"
-exec admin "lua type(tuple)"
-exec admin "lua #tuple"
+admin("lua remote = box.net.box.new('localhost', box.cfg.primary_port, '0.5')")
+admin("lua type(remote)")
+admin("lua remote:ping()")
+admin("lua remote:ping()")
+admin("lua box.net.box.ping(remote)")
+admin("lua box.insert(0, 123, 'test1', 'test2')")
+admin("lua box.select(0, 0, 123)")
+admin("lua tuple = remote:select(0, 0, 123)")
+admin("lua remote:call('box.select', '0', '0', 123)")
+admin("lua tuple")
+admin("lua type(tuple)")
+admin("lua #tuple")
-exec admin "lua box.update(0, 123, '=p', 1, 'test1-updated')"
-exec admin "lua remote:update(0, 123, '=p', 2, 'test2-updated')"
+admin("lua box.update(0, 123, '=p', 1, 'test1-updated')")
+admin("lua remote:update(0, 123, '=p', 2, 'test2-updated')")
-exec admin "lua box.insert(0, 123, 'test1', 'test2')"
-exec admin "lua remote:insert(0, 123, 'test1', 'test2')"
+admin("lua box.insert(0, 123, 'test1', 'test2')")
+admin("lua remote:insert(0, 123, 'test1', 'test2')")
-exec admin "lua remote:insert(0, 345, 'test1', 'test2')"
-exec admin "lua remote:select(0, 0, 345)"
-exec admin "lua remote:call('box.select', '0', '0', 345)"
-exec admin "lua box.select(0, 0, 345)"
+admin("lua remote:insert(0, 345, 'test1', 'test2')")
+admin("lua remote:select(0, 0, 345)")
+admin("lua remote:call('box.select', '0', '0', 345)")
+admin("lua box.select(0, 0, 345)")
-exec admin "lua remote:replace(0, 345, 'test1-replaced', 'test2-replaced')"
-exec admin "lua box.select(0, 0, 345)"
-exec admin "lua remote:select_limit(0, 0, 0, 1000, 345)"
+admin("lua remote:replace(0, 345, 'test1-replaced', 'test2-replaced')")
+admin("lua box.select(0, 0, 345)")
+admin("lua remote:select_limit(0, 0, 0, 1000, 345)")
-exec admin "lua box.select_range(0, 0, 1000)"
-exec admin "lua remote:select_range(0, 0, 1000)"
-exec admin "lua box.select(0, 0, 345)"
-exec admin "lua remote:select(0, 0, 345)"
-exec admin "lua remote:timeout(0.5):select(0, 0, 345)"
+admin("lua box.select_range(0, 0, 1000)")
+admin("lua remote:select_range(0, 0, 1000)")
+admin("lua box.select(0, 0, 345)")
+admin("lua remote:select(0, 0, 345)")
+admin("lua remote:timeout(0.5):select(0, 0, 345)")
-exec admin "lua remote:call('box.fiber.sleep', '.01')"
-exec admin "lua remote:timeout(0.01):call('box.fiber.sleep', '10')"
+admin("lua remote:call('box.fiber.sleep', '.01')")
+admin("lua remote:timeout(0.01):call('box.fiber.sleep', '10')")
-exec admin "lua pstart = box.time()"
-exec admin "lua parallel = {}"
-exec admin "lua function parallel_foo(id) box.fiber.sleep(math.random() * .05) return id end"
-exec admin "lua parallel_foo('abc')"
-exec admin "lua for i = 1, 20 do box.fiber.resume(box.fiber.create(function() box.fiber.detach() local s = string.format('%07d', i) local so = remote:call('parallel_foo', s) table.insert(parallel, tostring(s == so[0]) ) end)) end"
-exec admin "lua for i = 1, 20 do if #parallel == 20 then break end box.fiber.sleep(0.1) end"
-exec admin "lua unpack(parallel)"
-exec admin "lua #parallel"
-exec admin "lua box.time() - pstart < 0.5"
+admin("lua pstart = box.time()")
+admin("lua parallel = {}")
+admin("lua function parallel_foo(id) box.fiber.sleep(math.random() * .05) return id end")
+admin("lua parallel_foo('abc')")
+admin("lua for i = 1, 20 do box.fiber.resume(box.fiber.create(function() box.fiber.detach() local s = string.format('%07d', i) local so = remote:call('parallel_foo', s) table.insert(parallel, tostring(s == so[0]) ) end)) end")
+admin("lua for i = 1, 20 do if #parallel == 20 then break end box.fiber.sleep(0.1) end")
+admin("lua unpack(parallel)")
+admin("lua #parallel")
+admin("lua box.time() - pstart < 0.5")
-exec admin "lua remote:close()"
-exec admin "lua remote:close()"
-exec admin "lua remote:ping()"
+admin("lua remote:close()")
+admin("lua remote:close()")
+admin("lua remote:ping()")
-exec admin "lua box.space[0]:truncate()"
+admin("lua box.space[0]:truncate()")
diff --git a/test/box/net_sql.mysql.skipcond b/test/box/net_sql.mysql.skipcond
index a9ba5af05b..056809619c 100644
--- a/test/box/net_sql.mysql.skipcond
+++ b/test/box/net_sql.mysql.skipcond
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
import os
diff --git a/test/box/net_sql.mysql.test b/test/box/net_sql.mysql.test
index 3ff9a9d396..22ada7b4df 100644
--- a/test/box/net_sql.mysql.test
+++ b/test/box/net_sql.mysql.test
@@ -1,28 +1,28 @@
-# encoding: tarantool
+# encoding: utf-8
-exec admin "lua c = box.net.sql.connect('abcd')"
-exec admin "lua dump = function(v) return box.cjson.encode(v) end"
+admin("lua c = box.net.sql.connect('abcd')")
+admin("lua dump = function(v) return box.cjson.encode(v) end")
-exec admin "lua connect = {}"
-exec admin "lua for tk in string.gmatch(os.getenv('MYSQL'), '[^:]+') do table.insert(connect, tk) end"
+admin("lua connect = {}")
+admin("lua for tk in string.gmatch(os.getenv('MYSQL'), '[^:]+') do table.insert(connect, tk) end")
# mysql
-exec admin "lua c = box.net.sql.connect('mysql', unpack(connect))"
-exec admin "lua for k, v in pairs(c) do print(k, ': ', type(v)) end"
-exec admin "lua c:execute('SEL ECT 1')"
-exec admin "lua dump({c:execute('SELECT ? AS bool1, ? AS bool2, ? AS nil, ? AS num, ? AS str', true, false, nil, 123, 'abc')})"
+admin("lua c = box.net.sql.connect('mysql', unpack(connect))")
+admin("lua for k, v in pairs(c) do print(k, ': ', type(v)) end")
+admin("lua c:execute('SEL ECT 1')")
+admin("lua dump({c:execute('SELECT ? AS bool1, ? AS bool2, ? AS nil, ? AS num, ? AS str', true, false, nil, 123, 'abc')})")
-exec admin "lua dump({c:execute('SELECT * FROM (SELECT ?) t WHERE 1 = 0', 2)})"
-exec admin "lua dump({c:execute('CREATE PROCEDURE p1() BEGIN SELECT 1 AS One; SELECT 2 AS Two, 3 AS Three; END')})"
-exec admin "lua dump({c:execute('CALL p1')})"
-exec admin "lua dump({c:execute('DROP PROCEDURE p1')})"
-exec admin "lua dump({c:execute('SELECT 1 AS one UNION ALL SELECT 2')})"
-exec admin "lua dump({c:execute('SELECT 1 AS one UNION ALL SELECT 2; SELECT ? AS two', 'abc')})"
+admin("lua dump({c:execute('SELECT * FROM (SELECT ?) t WHERE 1 = 0', 2)})")
+admin("lua dump({c:execute('CREATE PROCEDURE p1() BEGIN SELECT 1 AS One; SELECT 2 AS Two, 3 AS Three; END')})")
+admin("lua dump({c:execute('CALL p1')})")
+admin("lua dump({c:execute('DROP PROCEDURE p1')})")
+admin("lua dump({c:execute('SELECT 1 AS one UNION ALL SELECT 2')})")
+admin("lua dump({c:execute('SELECT 1 AS one UNION ALL SELECT 2; SELECT ? AS two', 'abc')})")
-exec admin "lua c:quote('test \"abc\" test')"
+admin("lua c:quote('test \"abc\" test')")
-exec admin "lua c:begin_work()"
-exec admin "lua c:rollback()"
-exec admin "lua c:begin_work()"
-exec admin "lua c:commit()"
+admin("lua c:begin_work()")
+admin("lua c:rollback()")
+admin("lua c:begin_work()")
+admin("lua c:commit()")
diff --git a/test/box/net_sql.pg.skipcond b/test/box/net_sql.pg.skipcond
index 2eef42415d..361b0fede0 100644
--- a/test/box/net_sql.pg.skipcond
+++ b/test/box/net_sql.pg.skipcond
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
import os
diff --git a/test/box/net_sql.pg.test b/test/box/net_sql.pg.test
index df3c338f03..0bb91578f4 100644
--- a/test/box/net_sql.pg.test
+++ b/test/box/net_sql.pg.test
@@ -1,41 +1,41 @@
-# encoding: tarantool
+# encoding: utf-8
-exec admin "lua c = box.net.sql.connect('abcd')"
-exec admin "lua dump = function(v) return box.cjson.encode(v) end"
+admin("lua c = box.net.sql.connect('abcd')")
+admin("lua dump = function(v) return box.cjson.encode(v) end")
-exec admin "lua connect = {}"
-exec admin "lua for tk in string.gmatch(os.getenv('PG'), '[^:]+') do table.insert(connect, tk) end"
+admin("lua connect = {}")
+admin("lua for tk in string.gmatch(os.getenv('PG'), '[^:]+') do table.insert(connect, tk) end")
# postgresql
-exec admin "lua c = box.net.sql.connect('pg', unpack(connect))"
-exec admin "lua dump({c:execute('SELECT 123::text AS bla, 345')})"
-exec admin "lua dump({c:execute('SELECT -1 AS neg, NULL AS abc')})"
-exec admin "lua dump({c:execute('SELECT -1.1 AS neg, 1.2 AS pos')})"
-exec admin "lua dump({c:execute('SELECT ARRAY[1,2] AS neg, 1.2 AS pos')})"
-exec admin "lua dump({c:execute('SELECT ? AS val', 'abc')})"
-exec admin "lua dump({c:execute('SELECT ? AS val', 123)})"
-exec admin "lua dump({c:execute('SELECT ? AS val', true)})"
-exec admin "lua dump({c:execute('SELECT ? AS val', false)})"
-exec admin "lua dump({c:execute('SELECT ? AS val, ? AS num, ? AS str', false, 123, 'abc')})"
-exec admin "lua dump({c:execute('DROP TABLE IF EXISTS unknown_table')})"
-exec admin "lua dump({c:execute('SELECT * FROM (VALUES (1,2), (2,3)) t')})"
-exec admin "lua c:ping()"
-exec admin "lua dump({c:select('SELECT * FROM (VALUES (1,2), (2,3)) t')})"
-exec admin "lua dump({c:single('SELECT * FROM (VALUES (1,2), (2,3)) t')})"
-exec admin "lua dump({c:single('SELECT * FROM (VALUES (1,2)) t')})"
-exec admin "lua dump({c:perform('SELECT * FROM (VALUES (1,2), (2,3)) t')})"
-exec admin "lua c:execute('SELEC T')"
-
-exec admin "lua c = box.net.sql.connect('abcd')"
-
-
-exec admin "lua c:quote('abc\"cde\"def')"
-
-
-exec admin "lua c:begin_work()"
-exec admin "lua c:rollback()"
-exec admin "lua c:begin_work()"
-exec admin "lua c:commit()"
-
-exec admin "lua c:txn(function(dbi) dbi:single('SELECT 1') end)"
+admin("lua c = box.net.sql.connect('pg', unpack(connect))")
+admin("lua dump({c:execute('SELECT 123::text AS bla, 345')})")
+admin("lua dump({c:execute('SELECT -1 AS neg, NULL AS abc')})")
+admin("lua dump({c:execute('SELECT -1.1 AS neg, 1.2 AS pos')})")
+admin("lua dump({c:execute('SELECT ARRAY[1,2] AS neg, 1.2 AS pos')})")
+admin("lua dump({c:execute('SELECT ? AS val', 'abc')})")
+admin("lua dump({c:execute('SELECT ? AS val', 123)})")
+admin("lua dump({c:execute('SELECT ? AS val', true)})")
+admin("lua dump({c:execute('SELECT ? AS val', false)})")
+admin("lua dump({c:execute('SELECT ? AS val, ? AS num, ? AS str', false, 123, 'abc')})")
+admin("lua dump({c:execute('DROP TABLE IF EXISTS unknown_table')})")
+admin("lua dump({c:execute('SELECT * FROM (VALUES (1,2), (2,3)) t')})")
+admin("lua c:ping()")
+admin("lua dump({c:select('SELECT * FROM (VALUES (1,2), (2,3)) t')})")
+admin("lua dump({c:single('SELECT * FROM (VALUES (1,2), (2,3)) t')})")
+admin("lua dump({c:single('SELECT * FROM (VALUES (1,2)) t')})")
+admin("lua dump({c:perform('SELECT * FROM (VALUES (1,2), (2,3)) t')})")
+admin("lua c:execute('SELEC T')")
+
+admin("lua c = box.net.sql.connect('abcd')")
+
+
+admin("lua c:quote('abc\"cde\"def')")
+
+
+admin("lua c:begin_work()")
+admin("lua c:rollback()")
+admin("lua c:begin_work()")
+admin("lua c:commit()")
+
+admin("lua c:txn(function(dbi) dbi:single('SELECT 1') end)")
diff --git a/test/box/protocol.test b/test/box/protocol.test
index 9c7db26a20..5c35db0ce5 100644
--- a/test/box/protocol.test
+++ b/test/box/protocol.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
#
import subprocess
import sys
@@ -10,5 +10,5 @@ p.wait()
for line in p.stdout.readlines():
sys.stdout.write(line)
-exec sql "delete from t0 where k0 = 1"
+sql("delete from t0 where k0 = 1")
# vim: syntax=python
diff --git a/test/box/reconfigure.test b/test/box/reconfigure.test
index c366aa0429..c32efb2b9a 100644
--- a/test/box/reconfigure.test
+++ b/test/box/reconfigure.test
@@ -1,9 +1,9 @@
-# encoding: tarantool
+# encoding: utf-8
#
-exec admin "lua box.cfg.too_long_threshold"
+admin("lua box.cfg.too_long_threshold")
# bad1
server.reconfigure("box/tarantool_bad1.cfg")
-exec admin "lua box.cfg.too_long_threshold"
+admin("lua box.cfg.too_long_threshold")
# bad2
server.reconfigure("box/tarantool_bad2.cfg")
# bad3
@@ -14,12 +14,12 @@ server.reconfigure("box/tarantool_bad4.cfg")
server.reconfigure("box/tarantool_bad5.cfg")
# good
server.reconfigure("box/tarantool_good.cfg")
-exec admin "lua box.cfg.too_long_threshold"
-exec admin "lua box.cfg.snap_io_rate_limit"
-exec admin "lua box.cfg.io_collect_interval"
+admin("lua box.cfg.too_long_threshold")
+admin("lua box.cfg.snap_io_rate_limit")
+admin("lua box.cfg.io_collect_interval")
# empty
server.reconfigure("box/tarantool_empty.cfg")
-exec admin "lua box.cfg.too_long_threshold"
+admin("lua box.cfg.too_long_threshold")
# no config
server.reconfigure(None)
@@ -27,23 +27,23 @@ server.reconfigure(None)
# cleanup
# restore default
server.reconfigure(self.suite_ini["config"])
-exec admin "lua box.cfg.too_long_threshold"
+admin("lua box.cfg.too_long_threshold")
print """#
# A test case for http://bugs.launchpad.net/bugs/712447:
# Valgrind reports use of not initialized memory after 'reload
# configuration'
#"""
-exec sql "insert into t0 values (1, 'tuple')"
-exec admin "save snapshot"
+sql("insert into t0 values (1, 'tuple')")
+admin("save snapshot")
server.reconfigure(None)
-exec sql "insert into t0 values (2, 'tuple 2')"
-exec admin "save snapshot"
+sql("insert into t0 values (2, 'tuple 2')")
+admin("save snapshot")
server.reconfigure("box/tarantool_good.cfg")
-exec sql "insert into t0 values (3, 'tuple 3')"
-exec admin "save snapshot"
+sql("insert into t0 values (3, 'tuple 3')")
+admin("save snapshot")
# Cleanup
server.reconfigure(self.suite_ini["config"])
-exec admin "lua box.space[0]:truncate()"
+admin("lua box.space[0]:truncate()")
# vim: syntax=python
diff --git a/test/box/session.test b/test/box/session.test
index e604dd5cac..b42beda1dc 100644
--- a/test/box/session.test
+++ b/test/box/session.test
@@ -1,73 +1,73 @@
-# encoding: tarantool
+# encoding: utf-8
from lib.admin_connection import AdminConnection
from lib.box_connection import BoxConnection
-exec admin "lua box.session.exists(box.session.id())"
-exec admin "lua box.session.exists()"
-exec admin "lua box.session.exists(1, 2, 3)"
-exec admin "lua box.session.exists(1234567890)"
+admin("lua box.session.exists(box.session.id())")
+admin("lua box.session.exists()")
+admin("lua box.session.exists(1, 2, 3)")
+admin("lua box.session.exists(1234567890)")
# check session.id()
-exec admin "lua box.session.id() > 0"
-exec admin "lua f = box.fiber.create(function() box.fiber.detach() failed = box.session.id() ~= 0 end)"
-exec admin "lua box.fiber.resume(f)"
-exec admin "lua failed"
-exec admin "lua f1 = box.fiber.create(function() if box.session.id() == 0 then failed = true end end)"
-exec admin "lua box.fiber.resume(f1)"
-exec admin "lua failed"
-exec admin "lua box.session.peer() == box.session.peer(box.session.id())"
+admin("lua box.session.id() > 0")
+admin("lua f = box.fiber.create(function() box.fiber.detach() failed = box.session.id() ~= 0 end)")
+admin("lua box.fiber.resume(f)")
+admin("lua failed")
+admin("lua f1 = box.fiber.create(function() if box.session.id() == 0 then failed = true end end)")
+admin("lua box.fiber.resume(f1)")
+admin("lua failed")
+admin("lua box.session.peer() == box.session.peer(box.session.id())")
# check on_connect/on_disconnect triggers
-exec admin "lua box.session.on_connect(function() end)"
-exec admin "lua box.session.on_disconnect(function() end)"
+admin("lua box.session.on_connect(function() end)")
+admin("lua box.session.on_disconnect(function() end)")
# check it's possible to reset these triggers
#
-exec admin "lua type(box.session.on_connect(function() error('hear') end))"
-exec admin "lua type(box.session.on_disconnect(function() error('hear') end))"
+admin("lua type(box.session.on_connect(function() error('hear') end))")
+admin("lua type(box.session.on_disconnect(function() error('hear') end))")
# check on_connect/on_disconnect argument count and type
-exec admin "lua box.session.on_connect()"
-exec admin "lua box.session.on_disconnect()"
+admin("lua box.session.on_connect()")
+admin("lua box.session.on_disconnect()")
-exec admin "lua box.session.on_connect(function() end, function() end)"
-exec admin "lua box.session.on_disconnect(function() end, function() end)"
+admin("lua box.session.on_connect(function() end, function() end)")
+admin("lua box.session.on_disconnect(function() end, function() end)")
-exec admin "lua box.session.on_connect(1, 2)"
-exec admin "lua box.session.on_disconnect(1, 2)"
+admin("lua box.session.on_connect(1, 2)")
+admin("lua box.session.on_disconnect(1, 2)")
-exec admin "lua box.session.on_connect(1)"
-exec admin "lua box.session.on_disconnect(1)"
+admin("lua box.session.on_connect(1)")
+admin("lua box.session.on_disconnect(1)")
# use of nil to clear the trigger
-exec admin "lua type(box.session.on_connect(nil))"
-exec admin "lua type(box.session.on_disconnect(nil))"
-exec admin "lua type(box.session.on_connect(nil))"
-exec admin "lua type(box.session.on_disconnect(nil))"
+admin("lua type(box.session.on_connect(nil))")
+admin("lua type(box.session.on_disconnect(nil))")
+admin("lua type(box.session.on_connect(nil))")
+admin("lua type(box.session.on_disconnect(nil))")
# check how connect/disconnect triggers work
-exec admin "lua function inc() active_connections = active_connections + 1 end"
-exec admin "lua function dec() active_connections = active_connections - 1 end"
-exec admin "lua box.session.on_connect(inc)"
-exec admin "lua box.session.on_disconnect(dec)"
-exec admin "lua active_connections = 0"
+admin("lua function inc() active_connections = active_connections + 1 end")
+admin("lua function dec() active_connections = active_connections - 1 end")
+admin("lua box.session.on_connect(inc)")
+admin("lua box.session.on_disconnect(dec)")
+admin("lua active_connections = 0")
con1 = AdminConnection('localhost', server.admin_port)
-exec con1 "lua active_connections"
+con1("lua active_connections")
con2 = AdminConnection('localhost', server.admin_port)
-exec con2 "lua active_connections"
+con2("lua active_connections")
con1.disconnect()
con2.disconnect()
-exec admin "lua type(box.session.on_connect(nil))"
-exec admin "lua type(box.session.on_disconnect(nil))"
+admin("lua type(box.session.on_connect(nil))")
+admin("lua type(box.session.on_disconnect(nil))")
# write audit trail of connect/disconnect into a space
-exec admin "lua box.session.on_connect(function() box.insert(0, box.session.id()) end)"
-exec admin "lua box.session.on_disconnect(function() box.delete(0, box.session.id()) end)"
-exec con1 "lua box.unpack('i', box.select(0, 0, box.session.id())[0]) == box.session.id()"
+admin("lua box.session.on_connect(function() box.insert(0, box.session.id()) end)")
+admin("lua box.session.on_disconnect(function() box.delete(0, box.session.id()) end)")
+con1("lua box.unpack('i', box.select(0, 0, box.session.id())[0]) == box.session.id()")
con1.disconnect()
# if on_connect() trigger raises an exception, the connection is dropped
-exec admin "lua type(box.session.on_connect(function() nosuchfunction() end))"
+admin("lua type(box.session.on_connect(function() nosuchfunction() end))")
con1 = BoxConnection('localhost', server.primary_port)
try:
con1.execute("select * from t0 where k0=0")
@@ -77,8 +77,8 @@ except Exception as e:
# cleanup
-exec admin "lua type(box.session.on_connect(nil))"
-exec admin "lua type(box.session.on_disconnect(nil))"
-exec admin "lua active_connections"
+admin("lua type(box.session.on_connect(nil))")
+admin("lua type(box.session.on_disconnect(nil))")
+admin("lua active_connections")
# vim: syntax=python
diff --git a/test/box/snapshot.test b/test/box/snapshot.test
index a653dbaafd..90ab8ba895 100644
--- a/test/box/snapshot.test
+++ b/test/box/snapshot.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
#
import os
import time
@@ -15,7 +15,7 @@ snapshot = os.path.join(vardir, "00000000000000000500.snap")
os.symlink(os.path.abspath("box/00000000000000000500.snap"), snapshot)
server.start()
for i in range(0, 501):
- exec sql "select * from t0 where k0={0}".format(i)
+ sql("select * from t0 where k0={0}".format(i))
print "# Restore the default server..."
server.stop()
os.unlink(snapshot)
@@ -28,28 +28,28 @@ print """#
# error that happens when saving snapshot is propagated
# to the caller.
"""
-exec sql "insert into t0 values (1, 'first tuple')"
-exec admin "save snapshot"
+sql("insert into t0 values (1, 'first tuple')")
+admin("save snapshot")
# In absence of data modifications, two consecutive
# 'save snapshot' statements will try to write
# into the same file, since file name is based
# on LSN.
# Don't allow to overwrite snapshots.
-exec admin "save snapshot"
+admin("save snapshot")
#
# Increment LSN
-exec sql "insert into t0 values (2, 'second tuple')"
+sql("insert into t0 values (2, 'second tuple')")
#
# Check for other errors, e.g. "Permission denied".
print "# Make 'var' directory read-only."
os.chmod(vardir, 0555)
-exec admin "save snapshot"
+admin("save snapshot")
# cleanup
os.chmod(vardir, 0755)
-exec sql "delete from t0 where k0 = 1"
-exec sql "delete from t0 where k0 = 2"
+sql("delete from t0 where k0 = 1")
+sql("delete from t0 where k0 = 2")
print """#
# A test case for http://bugs.launchpad.net/bugs/727174
@@ -60,9 +60,9 @@ print """
# Increment the lsn number, to make sure there is no such snapshot yet
#"""
-exec sql "insert into t0 values (1, 'Test tuple')"
+sql("insert into t0 values (1, 'Test tuple')")
-result = exec admin silent "show info"
+result = admin("show info", silent=True)
info = yaml.load(result)["info"]
pid = info["pid"]
@@ -84,6 +84,6 @@ if iteration == 0 or iteration >= MAX_ITERATIONS:
else:
print "Snapshot exists."
-exec sql "delete from t0 where k0=1"
+sql("delete from t0 where k0=1")
# vim: syntax=python spell
diff --git a/test/box/socket.test b/test/box/socket.test
index eda462da2e..edd960d4e0 100644
--- a/test/box/socket.test
+++ b/test/box/socket.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
import socket
@@ -8,22 +8,22 @@ import socket
# #
########################
-exec admin "lua s = box.socket.udp()"
-exec admin "lua type(s)"
-exec admin "lua s:close()"
-exec admin "lua s = box.socket.tcp()"
-exec admin "lua type(s)"
+admin("lua s = box.socket.udp()")
+admin("lua type(s)")
+admin("lua s:close()")
+admin("lua s = box.socket.tcp()")
+admin("lua type(s)")
### socket:close()
# close
-exec admin "lua s:close()"
+admin("lua s:close()")
# close (on closed)
-exec admin "lua s:close()"
+admin("lua s:close()")
# error
-exec admin "lua s:error()"
+admin("lua s:error()")
####################
# #
@@ -31,36 +31,36 @@ exec admin "lua s:error()"
# #
####################
-exec admin "lua s:connect('localhost', '30303')"
+admin("lua s:connect('localhost', '30303')")
# Connection refused
-exec admin "lua s:error()"
+admin("lua s:error()")
-exec admin "lua s:connect('127.0.0.1', '30303')"
+admin("lua s:connect('127.0.0.1', '30303')")
# Connection refused
-exec admin "lua s:error()"
+admin("lua s:error()")
-exec admin "lua s:connect('::1', '30303')"
+admin("lua s:connect('::1', '30303')")
# connection refused
-exec admin "lua s:error()"
+admin("lua s:error()")
-exec admin "lua s:connect('127.0.0.1', '30303', 0.01)"
+admin("lua s:connect('127.0.0.1', '30303', 0.01)")
# connection refused
-exec admin "lua s:error()"
+admin("lua s:error()")
# bad args
-exec admin "lua s:connect('127.0.0.1')"
-exec admin "lua s:connect()"
-exec admin "lua s:connect(123)"
-exec admin "lua s:close()"
+admin("lua s:connect('127.0.0.1')")
+admin("lua s:connect()")
+admin("lua s:connect(123)")
+admin("lua s:close()")
-exec admin "lua s:close()"
-exec admin "lua sr, se = s:connect('somewhereelse', '30303', 0.0001)"
-exec admin "lua sr == nil and se == 'error' or se == 'timeout'"
+admin("lua s:close()")
+admin("lua sr, se = s:connect('somewhereelse', '30303', 0.0001)")
+admin("lua sr == nil and se == 'error' or se == 'timeout'")
# timedout or hostname resolution failed
-exec admin "lua e = s:error()"
-exec admin "lua e == -1 or e == 110"
-exec admin "lua s:close()"
+admin("lua e = s:error()")
+admin("lua e == -1 or e == 110")
+admin("lua s:close()")
#################
# #
@@ -69,30 +69,30 @@ exec admin "lua s:close()"
#################
# bad args
-exec admin "lua s:send()"
-exec admin "lua s:send(1)"
+admin("lua s:send()")
+admin("lua s:send(1)")
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30303))
s.listen(1)
-exec admin "lua s = box.socket.tcp()"
-exec admin "lua type(s:connect('127.0.0.1', '30303'))"
-exec admin "lua s:send('ping')"
-exec admin "lua s:error()"
+admin("lua s = box.socket.tcp()")
+admin("lua type(s:connect('127.0.0.1', '30303'))")
+admin("lua s:send('ping')")
+admin("lua s:error()")
# timedout - try to send 64MB (8388608 * 8 bytes) in 0.0000001 sec
-exec admin "lua n, status, error_code, error_str = s:send(string.rep('=', 8388608), 0.0000001)"
-exec admin "lua type(n)"
-exec admin "lua type(status)"
-exec admin "lua type(error_code)"
-exec admin "lua type(error_str)"
-exec admin "lua status"
-exec admin "lua error_code"
-exec admin "lua error_str"
+admin("lua n, status, error_code, error_str = s:send(string.rep('=', 8388608), 0.0000001)")
+admin("lua type(n)")
+admin("lua type(status)")
+admin("lua type(error_code)")
+admin("lua type(error_str)")
+admin("lua status")
+admin("lua error_code")
+admin("lua error_str")
-exec admin "lua s:error()"
+admin("lua s:error()")
conn, addr = s.accept()
print('connected')
@@ -101,10 +101,10 @@ conn.close()
s.close()
# connection reset by peer
-exec admin "lua s:send('ping')"
-exec admin "lua s:error()"
+admin("lua s:send('ping')")
+admin("lua s:error()")
-exec admin "lua s:close()"
+admin("lua s:close()")
#################
# #
@@ -113,7 +113,7 @@ exec admin "lua s:close()"
#################
# bad args
-exec admin "lua s:recv()"
+admin("lua s:recv()")
# test for case #1: successful recv
#
@@ -121,13 +121,13 @@ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30308))
s.listen(1)
-exec admin "lua type(s:connect('127.0.0.1', '30308'))"
-exec admin "lua s:error()"
+admin("lua type(s:connect('127.0.0.1', '30308'))")
+admin("lua s:error()")
conn, addr = s.accept()
print(conn.send("Hello, World"))
-exec admin "lua s:recv(12)"
-exec admin "lua s:error()"
-exec admin "lua s:close()"
+admin("lua s:recv(12)")
+admin("lua s:error()")
+admin("lua s:close()")
conn.close()
s.close()
@@ -137,15 +137,15 @@ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30308))
s.listen(1)
-exec admin "lua type(s:connect('127.0.0.1', '30308'))"
-exec admin "lua s:error()"
+admin("lua type(s:connect('127.0.0.1', '30308'))")
+admin("lua s:error()")
conn, addr = s.accept()
print(conn.send("Hello World Oversized"))
-exec admin "lua s:recv(11)"
-exec admin "lua s:recv(5)"
-exec admin "lua s:recv(5)"
-exec admin "lua s:error()"
-exec admin "lua s:close()"
+admin("lua s:recv(11)")
+admin("lua s:recv(5)")
+admin("lua s:recv(5)")
+admin("lua s:error()")
+admin("lua s:close()")
conn.close()
s.close()
@@ -156,24 +156,24 @@ s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30308))
s.listen(1)
-exec admin "lua type(s:connect('127.0.0.1', '30308'))"
-exec admin "lua s:error()"
+admin("lua type(s:connect('127.0.0.1', '30308'))")
+admin("lua s:error()")
conn, addr = s.accept()
print('connected')
print(conn.send("pin"))
-exec admin "lua s:recv(4, 0.01)"
+admin("lua s:recv(4, 0.01)")
# timedout
-exec admin "lua s:error()"
+admin("lua s:error()")
conn.send("g")
# ping
-exec admin "lua s:recv(4)"
-exec admin "lua s:error()"
+admin("lua s:recv(4)")
+admin("lua s:error()")
-exec admin "lua s:close()"
+admin("lua s:close()")
conn.close()
s.close()
@@ -184,17 +184,17 @@ s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30309))
s.listen(1)
-exec admin "lua type(s:connect('127.0.0.1', '30309'))"
-exec admin "lua s:error()"
+admin("lua type(s:connect('127.0.0.1', '30309'))")
+admin("lua s:error()")
conn, addr = s.accept()
print('connected')
print(conn.send("ping"))
conn.close()
-exec admin "lua s:recv(6)"
-exec admin "lua s:error()"
-exec admin "lua s:close()"
+admin("lua s:recv(6)")
+admin("lua s:error()")
+admin("lua s:close()")
s.close()
# test for case #4: EOF (data is more then recv size)
@@ -204,8 +204,8 @@ s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30311))
s.listen(1)
-exec admin "lua type(s:connect('127.0.0.1', '30311'))"
-exec admin "lua s:error()"
+admin("lua type(s:connect('127.0.0.1', '30311'))")
+admin("lua s:error()")
conn, addr = s.accept()
print('connected')
@@ -214,20 +214,20 @@ print(conn.send("ping ping ping ping end "))
conn.close()
# recv should not say EOF, even if it really happened
-exec admin "lua s:recv(5)"
-exec admin "lua s:recv(5)"
-exec admin "lua s:recv(5)"
-exec admin "lua s:recv(5)"
+admin("lua s:recv(5)")
+admin("lua s:recv(5)")
+admin("lua s:recv(5)")
+admin("lua s:recv(5)")
# eof
-exec admin "lua s:recv(5)"
+admin("lua s:recv(5)")
# eof (zero)
-exec admin "lua s:recv(5)"
+admin("lua s:recv(5)")
# eof (zero)
-exec admin "lua s:recv(5)"
+admin("lua s:recv(5)")
-exec admin "lua s:error()"
-exec admin "lua s:close()"
+admin("lua s:error()")
+admin("lua s:close()")
s.close()
#####################
@@ -252,130 +252,130 @@ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30305))
s.listen(1)
-exec admin "lua type(s:connect('127.0.0.1', '30305'))"
-exec admin "lua s:error()"
+admin("lua type(s:connect('127.0.0.1', '30305'))")
+admin("lua s:error()")
conn, addr = s.accept()
# 1. readline() == readline(limit == inf, seplist == {'\n'}, timeout == inf)
print(conn.send("Hello World\n"))
-exec admin "lua s:readline()"
-exec admin "lua s:error()"
+admin("lua s:readline()")
+admin("lua s:error()")
# 2. readline(limit)
print(conn.send("Hello World\n"))
-exec admin "lua s:readline(5)"
-exec admin "lua s:error()"
+admin("lua s:readline(5)")
+admin("lua s:error()")
# 3. readline(limit, timeout) (just api check)
-exec admin "lua s:readline(5, 0.01)"
-exec admin "lua s:error()"
-exec admin "lua s:readline(6, 0.01)"
-exec admin "lua s:error()"
+admin("lua s:readline(5, 0.01)")
+admin("lua s:error()")
+admin("lua s:readline(6, 0.01)")
+admin("lua s:error()")
# 4. readline({seplist})
print(conn.send("AbcDefGhi"))
-exec admin "lua s:readline({'i', 'D'})"
-exec admin "lua s:error()"
-exec admin "lua s:readline({'i', 'G'})"
-exec admin "lua s:error()"
-exec admin "lua s:readline({'i'})"
-exec admin "lua s:error()"
+admin("lua s:readline({'i', 'D'})")
+admin("lua s:error()")
+admin("lua s:readline({'i', 'G'})")
+admin("lua s:error()")
+admin("lua s:readline({'i'})")
+admin("lua s:error()")
print(conn.send("CatCowDogStar"))
-exec admin "lua s:readline({'Cat', 'Cow', 'Dog', 'Star'})"
-exec admin "lua s:error()"
-exec admin "lua s:readline({'Cat', 'Cow', 'Dog', 'Star'})"
-exec admin "lua s:error()"
-exec admin "lua s:readline({'Cat', 'Cow', 'Dog', 'Star'})"
-exec admin "lua s:error()"
-exec admin "lua s:readline({'Cat', 'Cow', 'Dog', 'Star'})"
-exec admin "lua s:error()"
+admin("lua s:readline({'Cat', 'Cow', 'Dog', 'Star'})")
+admin("lua s:error()")
+admin("lua s:readline({'Cat', 'Cow', 'Dog', 'Star'})")
+admin("lua s:error()")
+admin("lua s:readline({'Cat', 'Cow', 'Dog', 'Star'})")
+admin("lua s:error()")
+admin("lua s:readline({'Cat', 'Cow', 'Dog', 'Star'})")
+admin("lua s:error()")
# 5. readline(limit, {seplist})
print(conn.send("CatCoowDoggStar"))
-exec admin "lua s:readline(3, {'Cat', 'Coow'})"
-exec admin "lua s:error()"
-exec admin "lua s:readline(3, {'Cat', 'Coow'})"
-exec admin "lua s:error()"
-exec admin "lua s:readline(3, {'Dogg', 'Star'})"
-exec admin "lua s:error()"
-exec admin "lua s:readline(3, {'Dogg', 'Star'})"
-exec admin "lua s:error()"
+admin("lua s:readline(3, {'Cat', 'Coow'})")
+admin("lua s:error()")
+admin("lua s:readline(3, {'Cat', 'Coow'})")
+admin("lua s:error()")
+admin("lua s:readline(3, {'Dogg', 'Star'})")
+admin("lua s:error()")
+admin("lua s:readline(3, {'Dogg', 'Star'})")
+admin("lua s:error()")
# read 'tar' part
-exec admin "lua s:readline(3)"
-exec admin "lua s:error()"
+admin("lua s:readline(3)")
+admin("lua s:error()")
# 6. readline({seplist}, timeout)
print(conn.send("KKongKingCezaCezarCrown"))
-exec admin "lua sl = {'Crown', 'King', 'Kong', 'Cezar'}"
-exec admin "lua s:readline(sl, 1.0)"
-exec admin "lua s:error()"
-exec admin "lua s:readline(sl, 1.0)"
-exec admin "lua s:error()"
-exec admin "lua s:readline(sl, 1.0)"
-exec admin "lua s:error()"
-exec admin "lua s:readline(sl, 1.0)"
-exec admin "lua s:error()"
+admin("lua sl = {'Crown', 'King', 'Kong', 'Cezar'}")
+admin("lua s:readline(sl, 1.0)")
+admin("lua s:error()")
+admin("lua s:readline(sl, 1.0)")
+admin("lua s:error()")
+admin("lua s:readline(sl, 1.0)")
+admin("lua s:error()")
+admin("lua s:readline(sl, 1.0)")
+admin("lua s:error()")
# 7. readline(limit, {seplist}, timeout)
print(conn.send("RoAgathaPopPoCornDriveRoad"))
-exec admin "lua sl = {'Agatha', 'Road', 'Corn', 'Drive', 'Pop'}"
-exec admin "lua s:readline(64, sl, 1.0)"
-exec admin "lua s:error()"
-exec admin "lua s:readline(64, sl, 1.0)"
-exec admin "lua s:error()"
-exec admin "lua s:readline(64, sl, 1.0)"
-exec admin "lua s:error()"
-exec admin "lua s:readline(64, sl, 1.0)"
-exec admin "lua s:error()"
+admin("lua sl = {'Agatha', 'Road', 'Corn', 'Drive', 'Pop'}")
+admin("lua s:readline(64, sl, 1.0)")
+admin("lua s:error()")
+admin("lua s:readline(64, sl, 1.0)")
+admin("lua s:error()")
+admin("lua s:readline(64, sl, 1.0)")
+admin("lua s:error()")
+admin("lua s:readline(64, sl, 1.0)")
+admin("lua s:error()")
# test for case #2-3: timedout, errors
#
print(conn.send("AfricaCubaRomaniaCana"))
-exec admin "lua s:readline({'Canada'}, 0.01)"
+admin("lua s:readline({'Canada'}, 0.01)")
# timedout
-exec admin "lua s:error()"
+admin("lua s:error()")
print(conn.send("da"))
# should read whole line
-exec admin "lua s:readline({'Canada'}, 0.01)"
-exec admin "lua s:error()"
+admin("lua s:readline({'Canada'}, 0.01)")
+admin("lua s:error()")
# to ensure readahead pointer correctness
print(conn.send("Canada"))
-exec admin "lua s:readline({'Canada'}, 0.01)"
-exec admin "lua s:error()"
+admin("lua s:readline({'Canada'}, 0.01)")
+admin("lua s:error()")
# test for case #5: eof testing
#
print(conn.send("msg msg msg msg msg"))
conn.close()
-exec admin "lua s:readline({'msg'})"
-exec admin "lua s:error()"
+admin("lua s:readline({'msg'})")
+admin("lua s:error()")
-exec admin "lua s:readline({'msg'})"
-exec admin "lua s:error()"
+admin("lua s:readline({'msg'})")
+admin("lua s:error()")
-exec admin "lua s:readline({'msg'})"
-exec admin "lua s:error()"
+admin("lua s:readline({'msg'})")
+admin("lua s:error()")
-exec admin "lua s:readline({'msg'})"
-exec admin "lua s:error()"
+admin("lua s:readline({'msg'})")
+admin("lua s:error()")
-exec admin "lua s:readline({'msg'})"
-exec admin "lua s:error()"
+admin("lua s:readline({'msg'})")
+admin("lua s:error()")
# eof (zero)
-exec admin "lua s:readline({'msg'})"
-exec admin "lua s:error()"
+admin("lua s:readline({'msg'})")
+admin("lua s:error()")
# eof (zero)
-exec admin "lua s:readline({'msg'})"
-exec admin "lua s:error()"
+admin("lua s:readline({'msg'})")
+admin("lua s:error()")
-exec admin "lua s:close()"
+admin("lua s:close()")
s.close()
@@ -386,18 +386,18 @@ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30307))
s.listen(1)
-exec admin "lua type(s:connect('127.0.0.1', '30307'))"
-exec admin "lua s:error()"
+admin("lua type(s:connect('127.0.0.1', '30307'))")
+admin("lua s:error()")
conn, addr = s.accept()
print(conn.send("SomelongLongStringStrinString"))
conn.close()
# should be returned with eof flag
-exec admin "lua s:readline({'Z'})"
-exec admin "lua s:error()"
+admin("lua s:readline({'Z'})")
+admin("lua s:error()")
-exec admin "lua s:close()"
+admin("lua s:close()")
s.close()
@@ -415,47 +415,47 @@ s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30303))
s.listen(1)
-exec admin "lua type(s:connect('localhost', '30303'))"
-exec admin "lua s:send('ping')"
+admin("lua type(s:connect('localhost', '30303'))")
+admin("lua s:send('ping')")
conn, addr = s.accept()
print('connected')
data = conn.recv(4)
conn.sendall(data)
-exec admin "lua s:recv(4)"
+admin("lua s:recv(4)")
conn.close()
s.close()
-exec admin "lua s:send('ping')"
-exec admin "lua s:error()"
+admin("lua s:send('ping')")
+admin("lua s:error()")
# broken pipe
-exec admin "lua s:send('ping')"
-exec admin "lua s:error()"
+admin("lua s:send('ping')")
+admin("lua s:error()")
-exec admin "lua s:close()"
+admin("lua s:close()")
# echo server (box is server) (TCP).
#
# connect from test to echo server implemented in
# stored procedure and do send/recv.
#
-exec admin "lua type(s:bind('127.0.0.1', '30303'))"
-exec admin "lua type(s:listen())"
+admin("lua type(s:bind('127.0.0.1', '30303'))")
+admin("lua type(s:listen())")
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.connect(('127.0.0.1', 30303))
s.sendall('ping')
-exec admin "lua client, status, addr = s:accept()"
-exec admin "lua addr"
-exec admin "lua data = client:recv(4)"
-exec admin "lua data"
-exec admin "lua client:send(data, 4)"
-exec admin "lua client:close()"
-exec admin "lua s:close()"
+admin("lua client, status, addr = s:accept()")
+admin("lua addr")
+admin("lua data = client:recv(4)")
+admin("lua data")
+admin("lua client:send(data, 4)")
+admin("lua client:close()")
+admin("lua s:close()")
data = s.recv(4)
s.close()
@@ -471,44 +471,44 @@ s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30302))
# SOCK_DGRAM
-exec admin "lua s = box.socket.udp()"
-exec admin "lua type(s:sendto('ping', '127.0.0.1', '30302'))"
-exec admin "lua s:error()"
+admin("lua s = box.socket.udp()")
+admin("lua type(s:sendto('ping', '127.0.0.1', '30302'))")
+admin("lua s:error()")
data, addr = s.recvfrom(4)
print(data)
s.sendto(data, addr)
-exec admin "lua s:recv(4)"
+admin("lua s:recv(4)")
s.close()
-exec admin "lua s:close()"
+admin("lua s:close()")
# echo server (box is server) (UDP).
#
# connect from test to echo server implemented in
# stored procedure and do send/recv.
#
-exec admin "lua s = box.socket.udp()"
-exec admin "lua type(s:bind('127.0.0.1', '30301'))"
-exec admin "lua s:error()"
+admin("lua s = box.socket.udp()")
+admin("lua type(s:bind('127.0.0.1', '30301'))")
+admin("lua s:error()")
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
s.sendto('ping', ('127.0.0.1', 30301))
-exec admin "lua data, status, client, port = s:recvfrom(4)"
-exec admin "lua s:error()"
-exec admin "lua data"
-exec admin "lua client"
+admin("lua data, status, client, port = s:recvfrom(4)")
+admin("lua s:error()")
+admin("lua data")
+admin("lua client")
-exec admin "lua type(s:sendto(data, client, port))"
-exec admin "lua s:error()"
+admin("lua type(s:sendto(data, client, port))")
+admin("lua s:error()")
data = s.recv(4)
print(data)
s.close()
-exec admin "lua s:close()"
+admin("lua s:close()")
# Bug #1160869: incorrect fiber call order.
# (https://bugs.launchpad.net/tarantool/+bug/1160869)
@@ -528,11 +528,11 @@ function bug1160869()
return s:send(box.pack('iii', 65280, 0, 1))
end
"""
-exec admin "lua " + test.replace('\n', ' ')
-exec admin "lua bug1160869()"
-exec admin "lua bug1160869()"
-exec admin "lua bug1160869()"
-exec admin "lua replies"
+admin("lua " + test.replace('\n', ' '))
+admin("lua bug1160869()")
+admin("lua bug1160869()")
+admin("lua bug1160869()")
+admin("lua replies")
test="""
s = nil
@@ -559,8 +559,8 @@ function iotest()
return s:send(box.pack('iii', 65280, 0, syncno))
end
"""
-exec admin "lua " + test.replace('\n', ' ')
-exec admin "lua iotest()"
-exec admin "lua iotest()"
-exec admin "lua iotest()"
-exec admin "lua reps"
+admin("lua " + test.replace('\n', ' '))
+admin("lua iotest()")
+admin("lua iotest()")
+admin("lua iotest()")
+admin("lua reps")
diff --git a/test/box/sql.test b/test/box/sql.test
index 3b4fbcd8b0..eea66b9ec1 100644
--- a/test/box/sql.test
+++ b/test/box/sql.test
@@ -1,52 +1,52 @@
-# encoding: tarantool
-exec sql "ping"
+# encoding: utf-8
+sql("ping")
# xxx: bug -- currently selects no rows
-exec sql "select * from t0"
-exec sql "insert into t0 values (1, 'I am a tuple')"
-exec sql "select * from t0 where k0 = 1"
+sql("select * from t0")
+sql("insert into t0 values (1, 'I am a tuple')")
+sql("select * from t0 where k0 = 1")
# currently there is no way to find out how many records
# a space contains
-exec sql "select * from t0 where k0 = 0"
-exec sql "select * from t0 where k0 = 2"
+sql("select * from t0 where k0 = 0")
+sql("select * from t0 where k0 = 2")
server.restart()
-exec sql "select * from t0 where k0 = 1"
-exec admin 'save snapshot'
-exec sql "select * from t0 where k0 = 1"
+sql("select * from t0 where k0 = 1")
+admin("save snapshot")
+sql("select * from t0 where k0 = 1")
server.restart()
-exec sql "select * from t0 where k0 = 1"
-exec sql "delete from t0 where k0 = 1"
-exec sql "select * from t0 where k0 = 1"
+sql("select * from t0 where k0 = 1")
+sql("delete from t0 where k0 = 1")
+sql("select * from t0 where k0 = 1")
# xxx: update comes through, returns 0 rows affected
-exec sql "update t0 set k1 = 'I am a new tuple' where k0=1"
+sql("update t0 set k1 = 'I am a new tuple' where k0=1")
# nothing is selected, since nothing was there
-exec sql "select * from t0 where k0=1"
-exec sql "insert into t0 values (1, 'I am a new tuple')"
-exec sql "select * from t0 where k0 = 1"
-exec sql "update t0 set k1 = 'I am the newest tuple' where k0=1"
-exec sql "select * from t0 where k0 = 1"
+sql("select * from t0 where k0=1")
+sql("insert into t0 values (1, 'I am a new tuple')")
+sql("select * from t0 where k0 = 1")
+sql("update t0 set k1 = 'I am the newest tuple' where k0=1")
+sql("select * from t0 where k0 = 1")
# this is correct, can append field to tuple
-exec sql "update t0 set k1 = 'Huh', k2 = 'I am a new field! I was added via append' where k0=1"
-exec sql "select * from t0 where k0 = 1"
+sql("update t0 set k1 = 'Huh', k2 = 'I am a new field! I was added via append' where k0=1")
+sql("select * from t0 where k0 = 1")
# this is illegal
-exec sql "update t0 set k1 = 'Huh', k1000 = 'invalid field' where k0=1"
-exec sql "select * from t0 where k0 = 1"
-exec sql "replace into t0 values (1, 'I am a new tuple', 'stub')"
-exec sql "update t0 set k1 = 'Huh', k2 = 'Oh-ho-ho' where k0=1"
-exec sql "select * from t0 where k0 = 1"
+sql("update t0 set k1 = 'Huh', k1000 = 'invalid field' where k0=1")
+sql("select * from t0 where k0 = 1")
+sql("replace into t0 values (1, 'I am a new tuple', 'stub')")
+sql("update t0 set k1 = 'Huh', k2 = 'Oh-ho-ho' where k0=1")
+sql("select * from t0 where k0 = 1")
# check empty strings
-exec sql "update t0 set k1 = '', k2 = '' where k0=1"
-exec sql "select * from t0 where k0 = 1"
+sql("update t0 set k1 = '', k2 = '' where k0=1")
+sql("select * from t0 where k0 = 1")
# check type change
-exec sql "update t0 set k1 = 2, k2 = 3 where k0=1"
-exec sql "select * from t0 where k0 = 1"
+sql("update t0 set k1 = 2, k2 = 3 where k0=1")
+sql("select * from t0 where k0 = 1")
# check limits
-exec sql "insert into t0 values (0)"
-exec sql "select * from t0 where k0=0"
-exec sql "insert into t0 values (4294967295)"
-exec sql "select * from t0 where k0=4294967295"
+sql("insert into t0 values (0)")
+sql("select * from t0 where k0=0")
+sql("insert into t0 values (4294967295)")
+sql("select * from t0 where k0=4294967295")
# cleanup
-exec sql "delete from t0 where k0=0"
-exec sql "delete from t0 where k0=4294967295"
+sql("delete from t0 where k0=0")
+sql("delete from t0 where k0=4294967295")
print """#
# A test case for: http://bugs.launchpad.net/bugs/712456
@@ -54,15 +54,15 @@ print """#
# very large space id, no crash occurs.
#
"""
-exec sql "select * from t1 where k0 = 0"
-exec sql "select * from t65537 where k0 = 0"
-exec sql "select * from t4294967295 where k0 = 0"
-exec admin "lua box.space[0]:truncate()"
+sql("select * from t1 where k0 = 0")
+sql("select * from t65537 where k0 = 0")
+sql("select * from t4294967295 where k0 = 0")
+admin("lua box.space[0]:truncate()")
print """#
# A test case for: http://bugs.launchpad.net/bugs/716683
# Admin console should not stall on unknown command.
"""
-exec admin 'show status'
+admin("show status")
# vim: syntax=python
diff --git a/test/box/stat.test b/test/box/stat.test
index 1e8140d07f..0184a4ce18 100644
--- a/test/box/stat.test
+++ b/test/box/stat.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
#
# clear statistics
server.restart()
@@ -9,8 +9,8 @@ print """#
#
"""
for i in range(10):
- exec sql "insert into t0 values ({0}, 'tuple')".format(i)
-exec admin "show stat"
+ sql("insert into t0 values ({0}, 'tuple')".format(i))
+admin("show stat")
print """#
# restart server
#
@@ -20,10 +20,10 @@ print """#
# statistics must be zero
#
"""
-exec admin "show stat"
+admin("show stat")
# cleanup
for i in range(10):
- exec sql "delete from t0 where k0 = {0}".format(i)
+ sql("delete from t0 where k0 = {0}".format(i))
# vim: syntax=python
diff --git a/test/box/xlog.test b/test/box/xlog.test
index 8b803b4c10..b99118452f 100644
--- a/test/box/xlog.test
+++ b/test/box/xlog.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
#
import os
from os.path import abspath
@@ -16,11 +16,11 @@ wal_inprogress = os.path.join(vardir, "00000000000000000002.xlog.inprogress")
wal = os.path.join(vardir, "00000000000000000002.xlog")
server.start()
-exec sql "insert into t0 values (1, 'first tuple')"
+sql("insert into t0 values (1, 'first tuple')")
if os.access(wal_inprogress, os.F_OK):
print "00000000000000000002.xlog.inprogress exists"
-exec sql "insert into t0 values (2, 'second tuple')"
+sql("insert into t0 values (2, 'second tuple')")
if os.access(wal, os.F_OK) and not os.access(wal_inprogress, os.F_OK):
print "00000000000000000002.xlog.inprogress has been successfully renamed"
@@ -34,7 +34,7 @@ server.start()
wal_inprogress = os.path.join(vardir, "00000000000000000004.xlog.inprogress")
wal = os.path.join(vardir, "00000000000000000004.xlog")
-exec sql "insert into t0 values (3, 'third tuple')"
+sql("insert into t0 values (3, 'third tuple')")
if os.access(wal_inprogress, os.F_OK):
print "00000000000000000004.xlog.inprogress exists"
@@ -119,9 +119,9 @@ shutil.copy(abspath("box/dup_key1.xlog"),
shutil.copy(abspath("box/dup_key2.xlog"),
os.path.join(vardir, "00000000000000000004.xlog"))
server.start()
-exec admin "lua box.space[0]:select(0, 1)"
-exec admin "lua box.space[0]:select(0, 2)"
-exec admin "lua #box.space[0]"
+admin("lua box.space[0]:select(0, 1)")
+admin("lua box.space[0]:select(0, 2)")
+admin("lua #box.space[0]")
# cleanup
server.stop()
diff --git a/test/lib/sql_ast.py b/test/lib/sql_ast.py
index 26b6d07e43..abe931200f 100644
--- a/test/lib/sql_ast.py
+++ b/test/lib/sql_ast.py
@@ -81,7 +81,7 @@ ER = {
53: "ER_NO_SUCH_INDEX" ,
54: "ER_NO_SUCH_FIELD" ,
55: "ER_TUPLE_FOUND" ,
- 56: "ER_INDEX_VIOLATION" ,
+ 56: "ER_UNUSED" ,
57: "ER_NO_SUCH_SPACE"
}
diff --git a/test/lib/tarantool_connection.py b/test/lib/tarantool_connection.py
index dc674893cb..f60ad3de6c 100644
--- a/test/lib/tarantool_connection.py
+++ b/test/lib/tarantool_connection.py
@@ -74,4 +74,6 @@ class TarantoolConnection(object):
def __exit__(self, type, value, tb):
self.disconnect()
-
+
+ def __call__(self, command, silent=False):
+ return self.execute(command, silent)
diff --git a/test/lib/tarantool_preprocessor.py b/test/lib/tarantool_preprocessor.py
deleted file mode 100644
index 365bb0eb03..0000000000
--- a/test/lib/tarantool_preprocessor.py
+++ /dev/null
@@ -1,155 +0,0 @@
-import codecs
-import tokenize
-import cStringIO
-import encodings
-import pdb
-import re
-from encodings import utf_8
-import sys
-
-# tarantool operators
-TARANTOOL_OPERATORS = [ 'exec', 'send', 'recv' ]
-
-TARANTOOL_METHODS = {
- 'exec' : 'execute',
- 'send' : 'send',
- 'recv' : 'recv'
-}
-
-def tarantool_translate(readline):
- token_stream = tokenize.generate_tokens(readline)
- for token in token_stream:
- token_buffer = [ token ]
- # chec token type
- if token_is_operator(token):
- # translate tarantool operator
- translate_command(token_buffer, token_stream)
-
- while len(token_buffer) > 0:
- yield token_buffer.pop(0)
-
-
-def translate_command(token_buffer, token_stream):
- operator = token_buffer.pop(0)
- object = next(token_stream)
- if token_is_identifier(object):
- # translate operator
- translate_operator(token_buffer, operator, object)
- translate_operands(token_buffer, operator, token_stream)
- else:
- token_buffer.append(operator)
- token_buffer.append(object)
-
-
-def translate_operator(token_buffer, operator, object):
- # operator object -> object.method
- # put object
- token_buffer.append(object[:2] + operator[2:])
- # put comma
- token_buffer.append((tokenize.OP, '.') + operator[2:])
- # put method
- operator_name = operator[1]
- method_name = TARANTOOL_METHODS[operator_name]
- token_buffer.append((tokenize.NAME, method_name) + operator[2:])
-
-
-def translate_operands(token_buffer, operator, token_stream):
- # put open bracket
- token_buffer.append((tokenize.OP, '(') + operator[2:])
-
- # put all operatands
- token = next(token_stream)
-
- silent = False
- if token_is_modifier(token):
- silent = modifier_to_value(token[1])
- token = next(token_stream)
-
- comma_needed = False
- while not token_is_separator(token):
- token_buffer.append(token[:2] + operator[2:])
- comma_needed = True
- token = next(token_stream)
-
- # set verbose flag
- if comma_needed:
- # we have operatands, put comma before silent
- token_buffer.append((tokenize.OP, ',') + operator[2:])
- token_buffer.append((tokenize.NAME, 'silent') + operator[2:])
- token_buffer.append((tokenize.OP, '=') + operator[2:])
- token_buffer.append((tokenize.NAME, '%s' % silent) + operator[2:])
-
- # put close bracket
- token_buffer.append((tokenize.OP, ')') + operator[2:])
- # new line
- token_buffer.append((tokenize.NEWLINE, '\n') + operator[2:])
-
-
-def modifier_to_value(name):
- if name == 'silent':
- return True
- return False
-
-
-def token_is_modifier(token):
- token_type, token_name = token[:2]
- if token_type == tokenize.NAME and token_name in [ 'silent' , 'verbose' ]:
- return True
- return False
-
-
-def token_is_operator(token):
- token_type, token_name = token[:2]
- if token_type == tokenize.NAME and token_name in TARANTOOL_OPERATORS:
- return True
- return False
-
-
-def token_is_identifier(token):
- return token[0] == tokenize.NAME
-
-
-def token_is_separator(token):
- token_type = token[0]
- if token_type == tokenize.NEWLINE or token_type == tokenize.ENDMARKER:
- return True
- return False
-
-
-class TarantoolStreamReader(utf_8.StreamReader):
- def __init__(self, *args, **kwargs):
- utf_8.StreamReader.__init__(self, *args, **kwargs)
- try:
- data = tokenize.untokenize(tarantool_translate(self.stream.readline))
- self.stream = cStringIO.StringIO(data)
- except Exception:
- self.stream.seek(0)
-
-
-def tarantool_encoding_builder(encoding_name):
- """Return an encoding that pre-processes the input and
- rewrites it to be pure python"""
- if encoding_name == "tarantool":
- utf8 = encodings.search_function("utf8")
- return codecs.CodecInfo(name = "tarantool",
- encode = utf8.encode,
- decode = utf8.decode,
- incrementalencoder = utf8.incrementalencoder,
- incrementaldecoder = utf8.incrementaldecoder,
- streamreader = TarantoolStreamReader,
- streamwriter = utf8.streamwriter)
- return None
-
-codecs.register(tarantool_encoding_builder)
-
-
-def main():
- py_input = """exec admin 'show info'
-print 'hello'
-exec sql 'select * from namespace1'\n"""
- print py_input
- py_stream = cStringIO.StringIO(py_input)
- print tokenize.untokenize(tarantool_translate(py_stream.readline))
-
-if __name__ == "__main__":
- main()
diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py
index 5ae0eb9f10..4e90a32ca1 100644
--- a/test/lib/tarantool_server.py
+++ b/test/lib/tarantool_server.py
@@ -10,8 +10,6 @@ import subprocess
import ConfigParser
import pprint
-import tarantool_preprocessor
-
from server import Server
from box_connection import BoxConnection
from test_suite import FilteredStream, Test
diff --git a/test/lib/test_suite.py b/test/lib/test_suite.py
index 768086630d..ff24e28508 100644
--- a/test/lib/test_suite.py
+++ b/test/lib/test_suite.py
@@ -12,7 +12,6 @@ import shlex
import time
from server import Server
-import tarantool_preprocessor
import re
import cStringIO
import string
diff --git a/test/lib/unittest_server.py b/test/lib/unittest_server.py
index 24ec2597d1..cba7afc1ba 100644
--- a/test/lib/unittest_server.py
+++ b/test/lib/unittest_server.py
@@ -6,7 +6,6 @@ import subprocess
from subprocess import Popen, PIPE
-import tarantool_preprocessor
from server import Server
from test_suite import FilteredStream, Test
diff --git a/test/memcached/binary-get.test b/test/memcached/binary-get.test
index c63eaaa72e..a9714cfd9a 100644
--- a/test/memcached/binary-get.test
+++ b/test/memcached/binary-get.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
blobs_list = [ "mooo\0", "mumble\0\0\0\0\r\rblarg", "\0", "\r" ]
for i in range(len(blobs_list)):
@@ -7,8 +7,8 @@ for i in range(len(blobs_list)):
blob_len = len(blob)
print "len is %d" % blob_len
- exec memcached "set %s 0 0 %d\r\n%s\r\n" % (key, blob_len, blob)
- exec memcached "get %s\r\n" % key
+ memcached("set %s 0 0 %d\r\n%s\r\n" % (key, blob_len, blob))
+ memcached("get %s\r\n" % key)
# resore default suite config
server.stop()
diff --git a/test/memcached/bogus-commands.test b/test/memcached/bogus-commands.test
index 08eba780cd..a19830af0d 100644
--- a/test/memcached/bogus-commands.test
+++ b/test/memcached/bogus-commands.test
@@ -1,3 +1,3 @@
-# encoding: tarantool
-exec memcached "boguscommand slkdsldkfjsd\r\n"
+# encoding: utf-8
+memcached("boguscommand slkdsldkfjsd\r\n")
# vim: syntax=python
diff --git a/test/memcached/cas.test b/test/memcached/cas.test
index 843ca3da86..7f299b3df1 100644
--- a/test/memcached/cas.test
+++ b/test/memcached/cas.test
@@ -1,59 +1,59 @@
-# encoding: tarantool
+# encoding: utf-8
import sys
from lib.memcached_connection import MemcachedConnection
-exec memcached "cas bad blah 0 0 0\r\n"
-exec memcached "cas bad 0 blah 0 0\r\n"
-exec memcached "cas bad 0 0 blah 0\r\n"
-exec memcached "cas bad 0 0 0 blah\r\n"
+memcached("cas bad blah 0 0 0\r\n")
+memcached("cas bad 0 blah 0 0\r\n")
+memcached("cas bad 0 0 blah 0\r\n")
+memcached("cas bad 0 0 0 blah\r\n")
print """# gets foo (should not exist) """
-exec memcached "gets foo\r\n"
+memcached("gets foo\r\n")
print """# set foo """
-exec memcached "set foo 0 0 6\r\nbarval\r\n"
+memcached("set foo 0 0 6\r\nbarval\r\n")
print """# gets foo and verify identifier exists """
-exec memcached "gets foo\r\n"
+memcached("gets foo\r\n")
print """# cas fail """
-exec memcached "cas foo 0 0 6 123\r\nbarva2\r\n"
+memcached("cas foo 0 0 6 123\r\nbarva2\r\n")
print """# gets foo and verify identifier exists """
sys.stdout.write("gets foo\r\n")
-result = exec memcached silent "gets foo\r\n"
+result = memcached("gets foo\r\n", silent=True)
unique_id = int(result.split()[4])
print """# cas success """
sys.stdout.write("cas foo 0 0 6 <unique_id>\r\nbarva2\r\n")
-result = exec memcached silent "cas foo 0 0 6 %d\r\nbarva2\r\n" % unique_id
+result = memcached("cas foo 0 0 6 %d\r\nbarva2\r\n" % unique_id, silent=True)
sys.stdout.write(result)
print """# cas failure (reusing the same key) """
sys.stdout.write("cas foo 0 0 6 <unique_id>\r\nbarva2\r\n")
-result = exec memcached silent "cas foo 0 0 6 %d\r\nbarva2\r\n" % unique_id
+result = memcached("cas foo 0 0 6 %d\r\nbarva2\r\n" % unique_id, silent=True)
sys.stdout.write(result)
print """# delete foo """
-exec memcached "delete foo\r\n"
+memcached("delete foo\r\n")
print """# cas missing """
sys.stdout.write("cas foo 0 0 6 <unique_id>\r\nbarva2\r\n")
-result = exec memcached silent "cas foo 0 0 6 %d\r\nbarva2\r\n" % unique_id
+result = memcached("cas foo 0 0 6 %d\r\nbarva2\r\n" % unique_id, silent=True)
sys.stdout.write(result)
print """# set foo1 """
-exec memcached "set foo1 0 0 1\r\n1\r\n"
+memcached("set foo1 0 0 1\r\n1\r\n")
print """# set foo2 """
-exec memcached "set foo2 0 0 1\r\n2\r\n"
+memcached("set foo2 0 0 1\r\n2\r\n")
print """# gets foo1 check """
-result = exec memcached "gets foo1\r\n"
+result = memcached("gets foo1\r\n")
foo1_cas = int(result.split()[4])
print """# gets foo2 check """
-result = exec memcached "gets foo2\r\n"
+result = memcached("gets foo2\r\n")
foo2_cas = int(result.split()[4])
print """# validate foo1 != foo2 """
@@ -66,23 +66,23 @@ memcached1 = server.memcached
memcached2 = MemcachedConnection('localhost', server.memcached_port)
print """# gets foo from memcached1 - should success """
-result = exec memcached1 silent "gets foo1\r\n"
+result = memcached1("gets foo1\r\n", silent=True)
mem1_cas = int(result.split()[4])
print """# gets foo from memcached2 - should success """
-result = exec memcached2 silent "gets foo1\r\n"
+result = memcached2("gets foo1\r\n", silent=True)
mem2_cas = int(result.split()[4])
print """# send 'cas foo1' from memcached1 """
-send memcached1 silent "cas foo1 0 0 6 %d\r\nbarva2\r\n" % mem1_cas
+memcached1.send("cas foo1 0 0 6 %d\r\nbarva2\r\n" % mem1_cas, silent=True)
print """# send 'cas foo1' from memcached2 """
-send memcached2 silent "cas foo1 0 0 4 %d\r\npear\r\n" % mem2_cas
+memcached2.send("cas foo1 0 0 4 %d\r\npear\r\n" % mem2_cas, silent=True)
print """# recv reply 'cas foo1' from memcached1 """
-result = recv memcached1 silent
+result = memcached1.recv(silent=True)
mem1_cas_result = result.split()[0]
print """# recv reply 'cas foo1' from memcached2 """
-result = recv memcached2 silent
+result = memcached.recv(silent=True)
mem2_cas_result = result.split()[0]
if mem1_cas_result == "STORED" and mem2_cas_result == "EXISTS":
@@ -95,16 +95,16 @@ else:
print "cas 2 = %s" % mem2_cas_result
print """# set bug15 """
-exec memcached "set bug15 0 0 1\r\n0\r\n"
+memcached("set bug15 0 0 1\r\n0\r\n")
print """# Check out the first gets. """
-result = exec memcached silent "gets bug15\r\n"
+result = memcached("gets bug15\r\n", silent=True)
bug15_cas = int(result.split()[4])
print """# Increment. """
-exec memcached "incr bug15 1\r\n"
+memcached("incr bug15 1\r\n")
print """# Validate a changed CAS. """
-result = exec memcached silent "gets bug15\r\n"
+result = memcached("gets bug15\r\n", silent=True)
next_bug15_cas = int(result.split()[4])
print """# validate bug15_cas != next_bug15_cas """
diff --git a/test/memcached/expirations.test b/test/memcached/expirations.test
index 5197d08aa7..d9981072af 100644
--- a/test/memcached/expirations.test
+++ b/test/memcached/expirations.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
import time
import yaml
@@ -12,7 +12,7 @@ def wait_for_next_lsn(lsn, serv):
def get_lsn(serv):
serv_admin = serv.admin
- resp = exec serv_admin silent "lua box.info.lsn"
+ resp = serv_admin("lua box.info.lsn", silent=True)
return yaml.load(resp)[0]
def wait(serv = server):
@@ -23,59 +23,59 @@ def wait(serv = server):
print """# expire: after 1 second"""
print """# set foo"""
-exec memcached "set foo 0 1 6\r\nfooval\r\n"
+memcached("set foo 0 1 6\r\nfooval\r\n")
print """# foo shoud be exists"""
-exec memcached "get foo\r\n"
+memcached("get foo\r\n")
wait()
print """# foo shoud expired"""
-exec memcached "get foo\r\n"
+memcached("get foo\r\n")
print """# expire: time - 1 second"""
expire = time.time() - 1
print """# set foo"""
-exec memcached silent "set foo 0 %d 6\r\nfooval\r\n" % expire
+memcached("set foo 0 %d 6\r\nfooval\r\n" % expire, silent=True)
print """# foo shoud expired"""
-exec memcached "get foo\r\n"
+memcached("get foo\r\n")
print """# expire: time + 1 second"""
expire = time.time() + 1
print """# set foo"""
-exec memcached silent "set foo 0 %d 6\r\nfooval\r\n" % expire
+memcached("set foo 0 %d 6\r\nfooval\r\n" % expire, silent=True)
print """# foo shoud be exists"""
-exec memcached "get foo\r\n"
+memcached("get foo\r\n")
wait()
print """# foo shoud expired"""
-exec memcached "get foo\r\n"
+memcached("get foo\r\n")
print """# expire: time - 20 second"""
expire = time.time() - 20
print """# set boo"""
-exec memcached silent "set boo 0 %d 6\r\nbooval\r\n" % expire
+memcached("set boo 0 %d 6\r\nbooval\r\n" % expire, silent=True)
print """# foo shoud expired"""
-exec memcached "get boo\r\n"
+memcached("get boo\r\n")
print """# expire: after 2 second"""
print """# add add"""
-exec memcached "add add 0 1 6\r\naddval\r\n"
+memcached("add add 0 1 6\r\naddval\r\n")
print """# readd add - shoud be fail"""
-exec memcached "add add 0 1 7\r\naddval1\r\n"
+memcached("add add 0 1 7\r\naddval1\r\n")
wait()
print """# readd add - shoud be success"""
-exec memcached "add add 0 1 7\r\naddval2\r\n"
+memcached("add add 0 1 7\r\naddval2\r\n")
# resore default suite config
server.stop()
diff --git a/test/memcached/flags.test b/test/memcached/flags.test
index 320906cc2f..bbebb17ba8 100644
--- a/test/memcached/flags.test
+++ b/test/memcached/flags.test
@@ -1,9 +1,9 @@
-# encoding: tarantool
+# encoding: utf-8
flags_list = [ 0x0, 0x7b, 0xffff ]
for flags in flags_list:
- exec memcached "set foo %d 0 6\r\nfooval\r\n" % flags
- result = exec memcached "gets foo\r\n"
+ memcached("set foo %d 0 6\r\nfooval\r\n" % flags)
+ result = memcached("gets foo\r\n")
ret_flags = int(result.split()[2])
if flags == ret_flags:
print "success: flags (0x%x) == ret_flags (0x%x)" % (flags, ret_flags)
diff --git a/test/memcached/flush-all.test b/test/memcached/flush-all.test
index 41693ed020..17d07d38d2 100644
--- a/test/memcached/flush-all.test
+++ b/test/memcached/flush-all.test
@@ -1,11 +1,11 @@
-# encoding: tarantool
+# encoding: utf-8
import time
import yaml
###################################
def get_memcached_len(serv):
serv_admin = serv.admin
- resp = exec serv_admin silent "lua box.space[box.cfg.memcached_space]:len()"
+ resp = serv_admin("lua box.space[box.cfg.memcached_space]:len()", silent=True)
return yaml.load(resp)[0]
def wait_for_empty_space(serv = server):
@@ -17,25 +17,25 @@ def wait_for_empty_space(serv = server):
###################################
print """# Test flush_all with zero delay. """
-exec memcached "set foo 0 0 6\r\nfooval\r\n"
-exec memcached "get foo\r\n"
-exec memcached "flush_all\r\n"
-exec memcached "get foo\r\n"
+memcached("set foo 0 0 6\r\nfooval\r\n")
+memcached("get foo\r\n")
+memcached("flush_all\r\n")
+memcached("get foo\r\n")
print """# check that flush_all doesn't blow away items that immediately get set """
-exec memcached "set foo 0 0 3\r\nnew\r\n"
-exec memcached "get foo\r\n"
+memcached("set foo 0 0 3\r\nnew\r\n")
+memcached("get foo\r\n")
print """# and the other form, specifying a flush_all time... """
expire = time.time() + 1
print "flush_all time + 1"
-print exec memcached silent "flush_all %d\r\n" % expire
-exec memcached "get foo\r\n"
+print memcached("flush_all %d\r\n" % expire, silent=True)
+memcached("get foo\r\n")
-exec memcached "set foo 0 0 3\r\n123\r\n"
-exec memcached "get foo\r\n"
+memcached("set foo 0 0 3\r\n123\r\n")
+memcached("get foo\r\n")
wait_for_empty_space()
-exec memcached "get foo\r\n"
+memcached("get foo\r\n")
# resore default suite config
server.stop()
diff --git a/test/memcached/getset.test b/test/memcached/getset.test
index bb74115a5b..3e13bda902 100644
--- a/test/memcached/getset.test
+++ b/test/memcached/getset.test
@@ -1,48 +1,48 @@
-# encoding: tarantool
+# encoding: utf-8
print """# set foo (and should get it) """
-exec memcached "set foo 0 0 6\r\nfooval\r\n"
-exec memcached "get foo\r\n"
+memcached("set foo 0 0 6\r\nfooval\r\n")
+memcached("get foo\r\n")
print """# add bar (and should get it)"""
-exec memcached "set bar 0 0 6\r\nbarval\r\n"
-exec memcached "get bar\r\n"
+memcached("set bar 0 0 6\r\nbarval\r\n")
+memcached("get bar\r\n")
print """# add foo (but shouldn't get new value)"""
-exec memcached "add foo 0 0 5\r\nfoov2\r\n"
-exec memcached "get foo\r\n"
+memcached("add foo 0 0 5\r\nfoov2\r\n")
+memcached("get foo\r\n")
print """# replace bar (should work)"""
-exec memcached "replace bar 0 0 6\r\nbarva2\r\n"
-exec memcached "get bar\r\n"
+memcached("replace bar 0 0 6\r\nbarva2\r\n")
+memcached("get bar\r\n")
print """# replace notexist (shouldn't work)"""
-exec memcached "replace notexist 0 0 6\r\nbarva2\r\n"
-exec memcached "get notexist\r\n"
+memcached("replace notexist 0 0 6\r\nbarva2\r\n")
+memcached("get notexist\r\n")
print """# delete foo"""
-exec memcached "delete foo\r\n"
-exec memcached "get foo\r\n"
+memcached("delete foo\r\n")
+memcached("get foo\r\n")
print """# delete foo again. not found this time."""
-exec memcached "delete foo\r\n"
-exec memcached "get foo\r\n"
+memcached("delete foo\r\n")
+memcached("get foo\r\n")
print """# add moo"""
-exec memcached "add moo 0 0 6\r\nmooval\r\n"
-exec memcached "get moo\r\n"
+memcached("add moo 0 0 6\r\nmooval\r\n")
+memcached("get moo\r\n")
print """# check-and-set (cas) failure case, try to set value with incorrect cas unique val"""
-exec memcached "cas moo 0 0 6 0\r\nMOOVAL\r\n"
-exec memcached "get moo\r\n"
+memcached("cas moo 0 0 6 0\r\nMOOVAL\r\n")
+memcached("get moo\r\n")
-result = exec memcached silent "gets moo\r\n"
+result = memcached("gets moo\r\n", silent=True)
unique_id = int(result.split()[4])
print """# now test that we can store moo with the correct unique id"""
-exec memcached silent "cas moo 0 0 6 %d\r\nMOOVAL\r\n" % unique_id
-exec memcached "get moo\r\n"
+memcached("cas moo 0 0 6 %d\r\nMOOVAL\r\n" % unique_id, silent=True)
+memcached("get moo\r\n")
-exec memcached "set foo 0 0 6\r\nfooval\r\ndelete foo\r\nset foo 0 0 6\r\nfooval\r\ndelete foo\r\n"
+memcached("set foo 0 0 6\r\nfooval\r\ndelete foo\r\nset foo 0 0 6\r\nfooval\r\ndelete foo\r\n")
len = 1024
while len < (1024 * 1028):
@@ -50,32 +50,32 @@ while len < (1024 * 1028):
if len > (1024 * 1024):
print """# Ensure causing a memory overflow doesn't leave stale data."""
print "# set small data: - should pass"
- exec memcached "set foo_%d 0 0 3\r\nMOO\r\n" % (len)
- exec memcached "get foo_%d\r\n" % (len)
+ memcached("set foo_%d 0 0 3\r\nMOO\r\n" % (len))
+ memcached("get foo_%d\r\n" % (len))
print "# set big data: - should fail"
print "set foo_%d 0 0 %d\r\n<big-data>\r\n" % (len, len)
- print exec memcached silent "set foo_%d 0 0 %d\r\n%s\r\n" % (len, len, val)
+ print memcached("set foo_%d 0 0 %d\r\n%s\r\n" % (len, len, val), silent=True)
else:
print "# set big data: - should pass"
print "set foo_%d 0 0 %d\r\n<big-data>\r\n" % (len, len)
- print exec memcached silent "set foo_%d 0 0 %d\r\n%s\r\n" % (len, len, val)
+ print memcached("set foo_%d 0 0 %d\r\n%s\r\n" % (len, len, val), silent=True)
len += 1024 * 512
print """#
# A test for Bug#898198 memcached protocol isn't case-insensitive"
#"""
-exec memcached "SET foo 0 0 6\r\nfooval\r\n"
-exec memcached "GET foo\r\n"
-exec memcached "ADD foo 0 0 5\r\nfoov2\r\n"
-exec memcached "GET foo\r\n"
-exec memcached "REPLACE bar 0 0 6\r\nbarva2\r\n"
-exec memcached "GET bar\r\n"
-exec memcached "DELETE foo\r\n"
-exec memcached "GET foo\r\n"
-exec memcached "CAS moo 0 0 6 0\r\nMOOVAL\r\n"
-exec memcached "GET moo\r\n"
-exec memcached "GETS moo\r\n"
+memcached("SET foo 0 0 6\r\nfooval\r\n")
+memcached("GET foo\r\n")
+memcached("ADD foo 0 0 5\r\nfoov2\r\n")
+memcached("GET foo\r\n")
+memcached("REPLACE bar 0 0 6\r\nbarva2\r\n")
+memcached("GET bar\r\n")
+memcached("DELETE foo\r\n")
+memcached("GET foo\r\n")
+memcached("CAS moo 0 0 6 0\r\nMOOVAL\r\n")
+memcached("GET moo\r\n")
+memcached("GETS moo\r\n")
# resore default suite config
server.stop()
diff --git a/test/memcached/incrdecr.test b/test/memcached/incrdecr.test
index 86e4f0124e..a081ccc107 100644
--- a/test/memcached/incrdecr.test
+++ b/test/memcached/incrdecr.test
@@ -1,37 +1,37 @@
-# encoding: tarantool
+# encoding: utf-8
print """# incr/decr big value """
-exec memcached "set bug21 0 0 19\r\n9223372036854775807\r\n"
-exec memcached "incr bug21 1\r\n"
-exec memcached "incr bug21 1\r\n"
-exec memcached "decr bug21 1\r\n"
+memcached("set bug21 0 0 19\r\n9223372036854775807\r\n")
+memcached("incr bug21 1\r\n")
+memcached("incr bug21 1\r\n")
+memcached("decr bug21 1\r\n")
print """# underflow protection """
-exec memcached "set num 0 0 1\r\n1\r\n"
-exec memcached "incr num 1\r\n"
-exec memcached "incr num 8\r\n"
-exec memcached "decr num 1\r\n"
-exec memcached "decr num 9\r\n"
-exec memcached "decr num 5\r\n"
+memcached("set num 0 0 1\r\n1\r\n")
+memcached("incr num 1\r\n")
+memcached("incr num 8\r\n")
+memcached("decr num 1\r\n")
+memcached("decr num 9\r\n")
+memcached("decr num 5\r\n")
print """# 32-bit value """
-exec memcached "set num 0 0 10\r\n4294967296\r\n"
-exec memcached "incr num 1\r\n"
+memcached("set num 0 0 10\r\n4294967296\r\n")
+memcached("incr num 1\r\n")
print """# overflow value """
-exec memcached "set num 0 0 20\r\n18446744073709551615\r\n"
-exec memcached "incr num 1\r\n"
+memcached("set num 0 0 20\r\n18446744073709551615\r\n")
+memcached("incr num 1\r\n")
print """# bogus """
-exec memcached "decr bogus 1\r\n"
-exec memcached "decr incr 1\r\n"
+memcached("decr bogus 1\r\n")
+memcached("decr incr 1\r\n")
print """# bit increment """
-exec memcached "set bigincr 0 0 1\r\n0\r\n"
-exec memcached "incr num 18446744073709551610\r\n"
+memcached("set bigincr 0 0 1\r\n0\r\n")
+memcached("incr num 18446744073709551610\r\n")
print """# incr text value error """
-exec memcached "set text 0 0 2\r\nhi\r\n"
-exec memcached "incr text 1\r\n"
+memcached("set text 0 0 2\r\nhi\r\n")
+memcached("incr text 1\r\n")
# resore default suite config
server.stop()
diff --git a/test/memcached/lua.test b/test/memcached/lua.test
index dc35d2cfa5..6e1fd54b9e 100644
--- a/test/memcached/lua.test
+++ b/test/memcached/lua.test
@@ -1,6 +1,6 @@
-# encoding: tarantool
-exec admin "lua box.space[box.cfg.memcached_space].cardinality"
-exec admin "lua box.space[box.cfg.memcached_space].estimated_rows"
-exec admin "lua box.space[box.cfg.memcached_space].n"
-exec admin "lua box.space[box.cfg.memcached_space].index[0].idx"
-exec admin "lua box.space[box.cfg.memcached_space].index[0].type"
+# encoding: utf-8
+admin("lua box.space[box.cfg.memcached_space].cardinality")
+admin("lua box.space[box.cfg.memcached_space].estimated_rows")
+admin("lua box.space[box.cfg.memcached_space].n")
+admin("lua box.space[box.cfg.memcached_space].index[0].idx")
+admin("lua box.space[box.cfg.memcached_space].index[0].type")
diff --git a/test/memcached/multiversioning.test b/test/memcached/multiversioning.test
index 9566c659ed..21f6997325 100644
--- a/test/memcached/multiversioning.test
+++ b/test/memcached/multiversioning.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
from lib.memcached_connection import MemcachedConnection
buf_size = 256 * 1024
@@ -10,20 +10,20 @@ memcached2 = MemcachedConnection('localhost', server.memcached_port)
print """# Store big in lower case via first memcached client """
print "set big 0 0 %d\r\n<big-value-lower-case>" % buf_size
-print exec memcached1 silent "set big 0 0 %d\r\n%s\r\n" % (buf_size, buf)
+print memcached1("set big 0 0 %d\r\n%s\r\n" % (buf_size, buf), silent=True)
print """# send command 'get big' to firs memcached client """
-send memcached1 "get big\r\n"
+memcached1.send("get big\r\n", silent=False)
print """# send command 'delete big' to second client """
-exec memcached2 "delete big\r\n"
+memcached2("delete big\r\n")
print """# Store big in lower case via first memcached client """
print "set big 0 0 %d\r\n<big-value-upper-case>" % buf_size
-print exec memcached2 silent "set big 0 0 %d\r\n%s\r\n" % (buf_size, buf_upper)
+print memcached2("set big 0 0 %d\r\n%s\r\n" % (buf_size, buf_upper), silent=True)
print """# recv reply 'get big' from the first memcached client """
-reply = recv memcached1 silent
+reply = memcached1.recv(silent=True)
reply_buf = reply.split('\r\n')[1]
if buf == reply_buf:
print "success: buf == reply"
@@ -35,5 +35,5 @@ else:
server.stop()
server.deploy(self.suite_ini["config"])
# check that we print clear memcached stats
-exec admin "show stat"
+admin("show stat")
# vim: syntax=python
diff --git a/test/memcached/noreply.test b/test/memcached/noreply.test
index e34d3f6b2d..c4654ae868 100644
--- a/test/memcached/noreply.test
+++ b/test/memcached/noreply.test
@@ -1,42 +1,42 @@
-# encoding: tarantool
+# encoding: utf-8
import sys
print """# Test that commands can take 'noreply' parameter. """
-exec memcached "flush_all noreply\r\n"
-exec memcached "flush_all 0 noreply\r\n"
+memcached("flush_all noreply\r\n")
+memcached("flush_all 0 noreply\r\n")
-exec memcached "get noreply:foo\r\n"
-exec memcached "add noreply:foo 0 0 1 noreply\r\n1\r\n"
-exec memcached "get noreply:foo\r\n"
+memcached("get noreply:foo\r\n")
+memcached("add noreply:foo 0 0 1 noreply\r\n1\r\n")
+memcached("get noreply:foo\r\n")
-exec memcached "set noreply:foo 0 0 1 noreply\r\n2\r\n"
-exec memcached "get noreply:foo\r\n"
+memcached("set noreply:foo 0 0 1 noreply\r\n2\r\n")
+memcached("get noreply:foo\r\n")
-exec memcached "replace noreply:foo 0 0 1 noreply\r\n3\r\n"
-exec memcached "get noreply:foo\r\n"
+memcached("replace noreply:foo 0 0 1 noreply\r\n3\r\n")
+memcached("get noreply:foo\r\n")
-exec memcached "append noreply:foo 0 0 1 noreply\r\n4\r\n"
-exec memcached "get noreply:foo\r\n"
+memcached("append noreply:foo 0 0 1 noreply\r\n4\r\n")
+memcached("get noreply:foo\r\n")
-exec memcached "prepend noreply:foo 0 0 1 noreply\r\n5\r\n"
-exec memcached "get noreply:foo\r\n"
+memcached("prepend noreply:foo 0 0 1 noreply\r\n5\r\n")
+memcached("get noreply:foo\r\n")
sys.stdout.write("gets noreply:foo\r\n")
-result = exec memcached silent "gets noreply:foo\r\n"
+result = memcached("gets noreply:foo\r\n", silent=True)
unique_id = int(result.split()[4])
sys.stdout.write("cas noreply:foo 0 0 1 <unique_id> noreply\r\n6\r\n")
-exec memcached silent "cas noreply:foo 0 0 1 %d noreply\r\n6\r\n" % unique_id
-exec memcached "get noreply:foo\r\n"
+memcached("cas noreply:foo 0 0 1 %d noreply\r\n6\r\n" % unique_id, silent=True)
+memcached("get noreply:foo\r\n")
-exec memcached "incr noreply:foo 3 noreply\r\n"
-exec memcached "get noreply:foo\r\n"
+memcached("incr noreply:foo 3 noreply\r\n")
+memcached("get noreply:foo\r\n")
-exec memcached "decr noreply:foo 2 noreply\r\n"
-exec memcached "get noreply:foo\r\n"
+memcached("decr noreply:foo 2 noreply\r\n")
+memcached("get noreply:foo\r\n")
-exec memcached "delete noreply:foo noreply\r\n"
-exec memcached "get noreply:foo\r\n"
+memcached("delete noreply:foo noreply\r\n")
+memcached("get noreply:foo\r\n")
# resore default suite config
server.stop()
diff --git a/test/memcached/off.test b/test/memcached/off.test
index d7859dabc1..fef9151a33 100644
--- a/test/memcached/off.test
+++ b/test/memcached/off.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
#
import os
@@ -17,7 +17,7 @@ server.stop()
# start server with memcached off
server.deploy("memcached/cfg/tarantool_memcached_off.cfg")
# check values
-exec admin "show configuration"
+admin("show configuration")
# stop current server
server.stop()
diff --git a/test/replication/consistent.test b/test/replication/consistent.test
index b537f7baf9..1d94f949be 100644
--- a/test/replication/consistent.test
+++ b/test/replication/consistent.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
import os
import time
from lib.tarantool_server import TarantoolServer
@@ -9,14 +9,14 @@ ID_STEP = 10
def insert_tuples(server, begin, end, msg = "tuple"):
server_sql = server.sql
for i in range(begin, end):
- exec server_sql "insert into t0 values (%d, '%s %d')" % (i, msg, i)
+ server_sql("insert into t0 values (%d, '%s %d')" % (i, msg, i))
def select_tuples(server, begin, end):
server_sql = server.sql
# the last lsn is end id + 1
server.wait_lsn(end + 1)
for i in range(begin, end):
- exec server_sql "select * from t0 where k0 = %d" % i
+ server_sql("select * from t0 where k0 = %d" % i)
# master server
master = server
@@ -157,7 +157,7 @@ print "replica lsn = %s" % replica.get_param("lsn")
# Test that a replica replies with master connection URL on
# update requests.
replica_sql = replica.sql
-exec replica_sql "insert into t0 values (0, 'replica is read only')"
+replica_sql("insert into t0 values (0, 'replica is read only')")
# Cleanup.
replica.stop()
diff --git a/test/replication/hot_standby.test b/test/replication/hot_standby.test
index 8f8e68cf62..aba0bd34fa 100644
--- a/test/replication/hot_standby.test
+++ b/test/replication/hot_standby.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
import os
import time
from lib.tarantool_server import TarantoolServer
@@ -29,14 +29,14 @@ print """
# Insert 10 tuples to master
"""
for i in range(id, id + 10):
- exec master_sql "insert into t0 values (%d, 'the tuple %d')" % (i, i)
+ master_sql("insert into t0 values (%d, 'the tuple %d')" % (i, i))
print """
# Select 10 tuples from master
"""
for i in range(id, id + 10):
- exec master_sql "select * from t0 where k0 = %d" % i
+ master_sql("select * from t0 where k0 = %d" % i)
print """
@@ -44,7 +44,7 @@ print """
"""
replica.wait_lsn(11)
for i in range(id, id + 10):
- exec replica_sql "select * from t0 where k0 = %d" % i
+ replica_sql("select * from t0 where k0 = %d" % i)
print """
@@ -61,14 +61,14 @@ print """
# Insert 10 tuples to hot_standby
"""
for i in range(id, id + 10):
- exec hot_standby_sql "insert into t0 values (%d, 'the tuple %d')" % (i, i)
+ hot_standby_sql("insert into t0 values (%d, 'the tuple %d')" % (i, i))
print """
# Select 10 tuples from hot_standby
"""
for i in range(id, id + 10):
- exec hot_standby_sql "select * from t0 where k0 = %d" % i
+ hot_standby_sql("select * from t0 where k0 = %d" % i)
print """
@@ -76,7 +76,7 @@ print """
"""
replica.wait_lsn(21)
for i in range(id, id + 10):
- exec replica_sql "select * from t0 where k0 = %d" % i
+ replica_sql("select * from t0 where k0 = %d" % i)
# Cleanup.
diff --git a/test/replication/memcached.test b/test/replication/memcached.test
index f7c3d45fbf..aaaabd2505 100644
--- a/test/replication/memcached.test
+++ b/test/replication/memcached.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
import os
import sys
import time
@@ -24,7 +24,7 @@ replica_memcached = replica.memcached
###################################
def get_lsn(serv):
serv_admin = serv.admin
- resp = exec serv_admin silent "lua box.info.lsn"
+ resp = serv_admin("lua box.info.lsn", silent=True)
return yaml.load(resp)[0]
def wait(serv_master = master, serv_replica = replica):
@@ -34,7 +34,7 @@ def wait(serv_master = master, serv_replica = replica):
def get_memcached_len(serv):
serv_admin = serv.admin
- resp = exec serv_admin silent "lua box.space[box.cfg.memcached_space]:len()"
+ resp = serv_admin("lua box.space[box.cfg.memcached_space]:len()", silent=True)
return yaml.load(resp)[0]
def wait_for_empty_space(serv):
@@ -48,54 +48,54 @@ def wait_for_empty_space(serv):
print """# set initial k-v pairs"""
for i in xrange(10):
- exec master_memcached silent "set %d 0 0 5\r\ngood%d\r\n" % (i, i)
+ master_memcached("set %d 0 0 5\r\ngood%d\r\n" % (i, i), silent=True)
print """# wait and get last k-v pair from replica"""
wait()
-exec replica_memcached "get 9\r\n"
+replica_memcached("get 9\r\n")
print """# make multiple cnanges with master"""
-answer = exec master_memcached silent "gets 9\r\n"
+answer = master_memcached("gets 9\r\n", silent=True)
cas = int(answer.split()[4])
-exec master_memcached silent "append 1 0 0 3\r\nafk\r\n"
-exec master_memcached silent "prepend 2 0 0 3\r\nkfa\r\n"
-exec master_memcached silent "set 3 0 0 2\r\n80\r\n"
-exec master_memcached silent "set 4 0 0 2\r\n60\r\n"
-exec master_memcached silent "delete 6\r\n"
-exec master_memcached silent "replace 7 0 0 %d\r\n%s\r\n" % (len(sonet[0]), sonet[0])
-exec master_memcached silent "replace 8 0 0 %d\r\n%s\r\n" % (len(sonet[1]), sonet[1])
-exec master_memcached silent "cas 9 0 0 %d %d\r\n%s\r\n" % (len(sonet[2]), cas, sonet[2])
-exec master_memcached silent "add 10 0 0 %d\r\n%s\r\n" % (len(sonet[3]), sonet[3])
-exec master_memcached silent "incr 3 15\r\n"
-exec master_memcached silent "decr 4 15\r\n"
+master_memcached("append 1 0 0 3\r\nafk\r\n", silent=True)
+master_memcached("prepend 2 0 0 3\r\nkfa\r\n", silent=True)
+master_memcached("set 3 0 0 2\r\n80\r\n", silent=True)
+master_memcached("set 4 0 0 2\r\n60\r\n", silent=True)
+master_memcached("delete 6\r\n", silent=True)
+master_memcached("replace 7 0 0 %d\r\n%s\r\n" % (len(sonet[0]), sonet[0]), silent=True)
+master_memcached("replace 8 0 0 %d\r\n%s\r\n" % (len(sonet[1]), sonet[1]), silent=True)
+master_memcached("cas 9 0 0 %d %d\r\n%s\r\n" % (len(sonet[2]), cas, sonet[2]), silent=True)
+master_memcached("add 10 0 0 %d\r\n%s\r\n" % (len(sonet[3]), sonet[3]), silent=True)
+master_memcached("incr 3 15\r\n", silent=True)
+master_memcached("decr 4 15\r\n", silent=True)
print """# wait and get k-v's from replicas"""
wait()
-exec replica_memcached "get 1 2 3 4 5 7 8 9 10\r\n"
+replica_memcached("get 1 2 3 4 5 7 8 9 10\r\n")
print """# get deleted value"""
-exec replica_memcached "get 6\r\n"
+replica_memcached("get 6\r\n")
print """# flush all k-v on master and try to get them from replica"""
-exec master_memcached silent "flush_all\r\n"
+master_memcached("flush_all\r\n", silent=True)
wait_for_empty_space(replica)
-exec replica_memcached "get 10\r\n"
+replica_memcached("get 10\r\n")
print """# check that expiration is working properly on replica"""
-exec master_memcached silent "set 1 0 1 %d\r\n%s\r\n" % (len(sonet[0]), sonet[0])
+master_memcached("set 1 0 1 %d\r\n%s\r\n" % (len(sonet[0]), sonet[0]), silent=True)
lsn = wait()
-exec replica_memcached "get 1\r\n"
+replica_memcached("get 1\r\n")
replica.wait_lsn(lsn + 1)
-exec replica_memcached "get 1\r\n"
+replica_memcached("get 1\r\n")
print """# check that expiration is working properly, when replica becomes master"""
-exec master_memcached silent "set 1 0 1 %d\r\n%s\r\n" % (len(sonet[0]), sonet[0])
+master_memcached("set 1 0 1 %d\r\n%s\r\n" % (len(sonet[0]), sonet[0]), silent=True)
lsn = wait()
replica.reconfigure("replication/cfg/replica_to_master.cfg")
-exec replica_memcached "get 1\r\n"
+replica_memcached("get 1\r\n")
replica.wait_lsn(lsn + 1)
-exec replica_memcached "get 1\r\n"
+replica_memcached("get 1\r\n")
# restore default suite config
diff --git a/test/replication/swap.test b/test/replication/swap.test
index 82afc13cc2..104afadc37 100644
--- a/test/replication/swap.test
+++ b/test/replication/swap.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
import os
import time
from lib.tarantool_server import TarantoolServer
@@ -10,14 +10,14 @@ ID_STEP = 5
def insert_tuples(server, begin, end, msg = "tuple"):
server_sql = server.sql
for i in range(begin, end):
- exec server_sql "insert into t0 values (%d, '%s %d')" % (i, msg, i)
+ server_sql("insert into t0 values (%d, '%s %d')" % (i, msg, i))
def select_tuples(server, begin, end):
server_sql = server.sql
# the last lsn is end id + 1
server.wait_lsn(end + 1)
for i in range(begin, end):
- exec server_sql "select * from t0 where k0 = %d" % i
+ server_sql("select * from t0 where k0 = %d" % i)
# master server
master = server
diff --git a/test/wal/lua.test b/test/wal/lua.test
index f7afffea50..a3b3060e51 100644
--- a/test/wal/lua.test
+++ b/test/wal/lua.test
@@ -1,4 +1,4 @@
-# encoding: tarantool
+# encoding: utf-8
import sys
print """
# A test case for Bug#1042738
@@ -6,13 +6,13 @@ print """
# Iteration over a non-unique TREE index
#"""
-exec admin 'lua for i=1, 1000 do box.space[1]:truncate() for j=1, 30 do box.insert(1, j, os.time(), 1) end; index = box.space[1].index[1]; count = 0; for k,v in index.next, index, nil do count = count+1; end; if count ~= 30 then print("bug at iteration ", i, ", count is ", count) end end'
-exec admin "lua box.space[1]:truncate()"
+admin('lua for i=1, 1000 do box.space[1]:truncate() for j=1, 30 do box.insert(1, j, os.time(), 1) end; index = box.space[1].index[1]; count = 0; for k,v in index.next, index, nil do count = count+1; end; if count ~= 30 then print("bug at iteration ", i, ", count is ", count) end end')
+admin("lua box.space[1]:truncate()")
print """
# A test case for Bug#1043858 server crash on lua stack overflow on CentOS
# 5.4
#"""
-exec admin "lua for i = 1, 100000, 1 do box.space[1]:insert(i,i) end"
-exec admin "lua local t1 = {box.select(1, 1)}"
-exec admin "lua box.space[1]:truncate()"
+admin("lua for i = 1, 100000, 1 do box.space[1]:insert(i,i) end")
+admin("lua local t1 = {box.select(1, 1)}")
+admin("lua box.space[1]:truncate()")
diff --git a/test/wal/oom.test b/test/wal/oom.test
index d5d5d1592b..38c79b027d 100644
--- a/test/wal/oom.test
+++ b/test/wal/oom.test
@@ -1,17 +1,17 @@
-# encoding: tarantool
-exec admin "lua i = 1 while true do box.insert(0, box.space[0]:len(), string.rep('test', i)) i = i + 1 end"
-exec admin "lua box.space[0]:len()"
-exec admin "lua i = 1 while true do box.insert(0, box.space[0]:len(), string.rep('test', i)) i = i + 1 end"
-exec admin "lua box.space[0]:len()"
-exec admin "lua i = 1 while true do box.insert(0, box.space[0]:len(), string.rep('test', i)) i = i + 1 end"
-exec admin "lua box.space[0]:len()"
-exec admin "lua box.space[0]:select(0, 0)"
-exec admin "lua box.space[0]:select(0, 5)"
-exec admin "lua box.space[0]:select(0, 9)"
-exec admin "lua box.space[0]:select(0, 11)"
-exec admin "lua box.space[0]:select(0, 15)"
+# encoding: utf-8
+admin("lua i = 1 while true do box.insert(0, box.space[0]:len(), string.rep('test', i)) i = i + 1 end")
+admin("lua box.space[0]:len()")
+admin("lua i = 1 while true do box.insert(0, box.space[0]:len(), string.rep('test', i)) i = i + 1 end")
+admin("lua box.space[0]:len()")
+admin("lua i = 1 while true do box.insert(0, box.space[0]:len(), string.rep('test', i)) i = i + 1 end")
+admin("lua box.space[0]:len()")
+admin("lua box.space[0]:select(0, 0)")
+admin("lua box.space[0]:select(0, 5)")
+admin("lua box.space[0]:select(0, 9)")
+admin("lua box.space[0]:select(0, 11)")
+admin("lua box.space[0]:select(0, 15)")
# check that iterators work
-exec admin "lua i = 0 for k,v in box.space[0]:pairs() do print(v) i = i + 1 if i == 50 then break end end"
-exec admin "lua box.space[0]:truncate()"
-exec admin "lua box.space[0]:insert(0, 'test')"
-exec admin "lua box.space[0]:truncate()"
+admin("lua i = 0 for k,v in box.space[0]:pairs() do print(v) i = i + 1 if i == 50 then break end end")
+admin("lua box.space[0]:truncate()")
+admin("lua box.space[0]:insert(0, 'test')")
+admin("lua box.space[0]:truncate()")
diff --git a/test/wal/wal_mode.test b/test/wal/wal_mode.test
index 6f48bbf0d7..0d17cca4d0 100644
--- a/test/wal/wal_mode.test
+++ b/test/wal/wal_mode.test
@@ -1,13 +1,13 @@
-# encoding: tarantool
-exec admin "lua box.cfg.wal_mode"
-exec sql "insert into t0 values (1)"
-exec sql "insert into t0 values (2)"
-exec sql "insert into t0 values (3)"
-exec sql "select * from t0 where k0 = 1"
-exec sql "select * from t0 where k0 = 2"
-exec sql "select * from t0 where k0 = 3"
-exec sql "select * from t0 where k0 = 4"
-exec admin "save snapshot"
-exec admin "save snapshot"
-exec admin "lua box.space[0]:truncate()"
-exec admin "save snapshot"
+# encoding: utf-8
+admin("lua box.cfg.wal_mode")
+sql("insert into t0 values (1)")
+sql("insert into t0 values (2)")
+sql("insert into t0 values (3)")
+sql("select * from t0 where k0 = 1")
+sql("select * from t0 where k0 = 2")
+sql("select * from t0 where k0 = 3")
+sql("select * from t0 where k0 = 4")
+admin("save snapshot")
+admin("save snapshot")
+admin("lua box.space[0]:truncate()")
+admin("save snapshot")
--
GitLab