diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 92eda4a682331c77684eb3a9335e81d3aae4eb0e..b121a9cc3da5a18ce2c1cd10308eac7a1ca62a66 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -83,9 +83,6 @@ set (common_sources
lua/init.cc
lua/fiber.cc
lua/trigger.cc
- lua/admin.cc
- lua/info.cc
- lua/stat.cc
lua/errinj.cc
lua/ipc.cc
lua/socket.cc
diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt
index 462a5db77c05f671845ba4d7fecf203bcf517125..71da73785475f02a28187c50d7bae4e855e6be2c 100644
--- a/src/box/CMakeLists.txt
+++ b/src/box/CMakeLists.txt
@@ -49,4 +49,6 @@ add_library(box
lua/slab.cc
lua/index.cc
lua/space.cc
+ lua/info.cc
+ lua/stat.cc
${bin_sources})
diff --git a/src/box/lua/box_net.lua b/src/box/lua/box_net.lua
index ed61121d5f1af56e1e4c3e61a35522db84f5624d..10cbb952af4dfd1c5a0c2c21cb274632f8e4b6b4 100644
--- a/src/box/lua/box_net.lua
+++ b/src/box/lua/box_net.lua
@@ -2,8 +2,9 @@
(function()
-local msgpack = require('box.msgpack')
-local boxfiber = require('box.fiber')
+local msgpack = require('msgpack')
+local fiber = require('fiber')
+local socket = require('socket')
local internal = require('box.internal')
local function keify(key)
@@ -330,22 +331,22 @@ box.net.box.new = function(host, port, reconnect_timeout)
end,
-- write channel
- wch = boxfiber.channel(1),
+ wch = fiber.channel(1),
-- ready socket channel
- rch = boxfiber.channel(1),
+ rch = fiber.channel(1),
},
process = function(self, op, request)
- local started = boxfiber.time()
+ local started = fiber.time()
local timeout = self.request_timeout
self.request_timeout = nil
-- get an auto-incremented request id
local sync = self.processing:next_sync()
- self.processing[sync] = boxfiber.channel(1)
+ self.processing[sync] = fiber.channel(1)
local header = msgpack.encode{
[box.net.box.TYPE] = op, [box.net.box.SYNC] = sync
}
@@ -359,7 +360,7 @@ box.net.box.new = function(host, port, reconnect_timeout)
return nil
end
- timeout = timeout - (boxfiber.time() - started)
+ timeout = timeout - (fiber.time() - started)
else
self.processing.wch:put(request)
end
@@ -416,7 +417,7 @@ box.net.box.new = function(host, port, reconnect_timeout)
return true
end
- local sc = require('box.socket').tcp()
+ local sc = socket.tcp()
if sc == nil then
self:fatal("Can't create socket")
return false
@@ -469,7 +470,7 @@ box.net.box.new = function(host, port, reconnect_timeout)
break
end
-- timeout between reconnect attempts
- boxfiber.sleep(self.reconnect_timeout)
+ fiber.sleep(self.reconnect_timeout)
end
-- wakeup write fiber
@@ -557,8 +558,8 @@ box.net.box.new = function(host, port, reconnect_timeout)
setmetatable( remote, { __index = box.net.box } )
- remote.irfiber = boxfiber.wrap(remote.rfiber, remote)
- remote.iwfiber = boxfiber.wrap(remote.wfiber, remote)
+ remote.irfiber = fiber.wrap(remote.rfiber, remote)
+ remote.iwfiber = fiber.wrap(remote.wfiber, remote)
remote.rpc = { r = remote }
setmetatable(remote.rpc, { __index = rpc_index })
diff --git a/src/box/lua/call.cc b/src/box/lua/call.cc
index 0d95547e7bebd80c1a1d4fe523c5b2a058b44d7e..4e4461c238b0c401199e9c2b56a0ee1b306d425d 100644
--- a/src/box/lua/call.cc
+++ b/src/box/lua/call.cc
@@ -34,6 +34,8 @@
#include "box/lua/tuple.h"
#include "box/lua/index.h"
#include "box/lua/space.h"
+#include "box/lua/stat.h"
+#include "box/lua/info.h"
#include "box/tuple.h"
#include "lua/utils.h"
@@ -920,10 +922,24 @@ lbox_unpack(struct lua_State *L)
#undef CHECK_SIZE
}
+static int
+lbox_snapshot(struct lua_State *L)
+{
+ int ret = box_snapshot();
+ if (ret == 0) {
+ lua_pushstring(L, "ok");
+ return 1;
+ }
+ luaL_error(L, "can't save snapshot, errno %d (%s)",
+ ret, strerror(ret));
+ return 1;
+}
+
static const struct luaL_reg boxlib[] = {
{"raise", lbox_raise},
{"pack", lbox_pack},
{"unpack", lbox_unpack},
+ {"snapshot", lbox_snapshot},
{NULL, NULL}
};
@@ -948,6 +964,8 @@ box_lua_init(struct lua_State *L)
box_lua_tuple_init(L);
box_lua_index_init(L);
box_lua_space_init(L);
+ box_lua_info_init(L);
+ box_lua_stat_init(L);
/* Load Lua extension */
for (const char **s = lua_sources; *s; s++) {
diff --git a/src/lua/info.cc b/src/box/lua/info.cc
similarity index 94%
rename from src/lua/info.cc
rename to src/box/lua/info.cc
index ff73e52309eff157d006537a8e3a1cf80fde273f..049cc44d8af544f2fca13ec191881c6af937e431 100644
--- a/src/lua/info.cc
+++ b/src/box/lua/info.cc
@@ -27,8 +27,7 @@
* SUCH DAMAGE.
*/
-#include "lua/info.h"
-#include "lua/utils.h"
+#include "info.h"
extern "C" {
#include <lua.h>
@@ -41,6 +40,7 @@ extern "C" {
#include "box/cluster.h"
#include "tarantool.h"
#include "box/box.h"
+#include "lua/utils.h"
static int
lbox_info_recovery_lag(struct lua_State *L)
@@ -219,14 +219,15 @@ lbox_info_call(struct lua_State *L)
/** Initialize box.info package. */
void
-tarantool_lua_info_init(struct lua_State *L)
+box_lua_info_init(struct lua_State *L)
{
- lua_getfield(L, LUA_GLOBALSINDEX, "box");
+ static const struct luaL_reg infolib [] = {
+ {NULL, NULL}
+ };
- lua_pushstring(L, "info");
- lua_newtable(L); /* box.info table */
+ luaL_register(L, "box.info", infolib);
- lua_newtable(L); /* metatable for box.info */
+ lua_newtable(L); /* metatable for info */
lua_pushstring(L, "__index");
@@ -243,6 +244,5 @@ tarantool_lua_info_init(struct lua_State *L)
lbox_info_init_static_values(L);
- lua_settable(L, -3); /* box.info = created table */
- lua_pop(L, 1); /* cleanup stack */
+ lua_pop(L, 1); /* info module */
}
diff --git a/src/lua/info.h b/src/box/lua/info.h
similarity index 96%
rename from src/lua/info.h
rename to src/box/lua/info.h
index bda434339ee1f6f9871ad7822d228725e1ed8206..1de986ca8fbfb8863a6ec5c15fb040391d64f351 100644
--- a/src/lua/info.h
+++ b/src/box/lua/info.h
@@ -31,6 +31,6 @@
*/
struct lua_State;
-void tarantool_lua_info_init(struct lua_State *L);
+void box_lua_info_init(struct lua_State *L);
#endif /* INCLUDES_TARANTOOL_LUA_INFO_H */
diff --git a/src/box/lua/schema.lua b/src/box/lua/schema.lua
index 006d4426856f2f5d8362cb02998f0146e3da1f70..f952c1448193eb0c6a899c517740e7f5d7ab1658 100644
--- a/src/box/lua/schema.lua
+++ b/src/box/lua/schema.lua
@@ -1,7 +1,12 @@
-- schema.lua (internal file)
--
local ffi = require('ffi')
-local session = require('box.session')
+local session = require('session')
+local msgpackffi = require('msgpackffi')
+local fun = require('fun')
+local internal = require('box.internal')
+
+local builtin = ffi.C
ffi.cdef[[
struct space *space_by_id(uint32_t id);
@@ -37,11 +42,6 @@ ffi.cdef[[
void password_prepare(const char *password, int len,
char *out, int out_len);
]]
-local builtin = ffi.C
-local msgpackffi = require('box.msgpackffi')
-local fun = require('fun')
-
-local internal = require('box.internal')
local function user_resolve(user)
local _user = box.space[box.schema.USER_ID]
diff --git a/src/lua/stat.cc b/src/box/lua/stat.cc
similarity index 91%
rename from src/lua/stat.cc
rename to src/box/lua/stat.cc
index 04078ae58c6aa6525dfd67271917576deef2951b..8fd0e7209e896a25f11d08c717b9759fc0afae3e 100644
--- a/src/lua/stat.cc
+++ b/src/box/lua/stat.cc
@@ -27,7 +27,7 @@
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#include "lua/stat.h"
+#include "stat.h"
#include <string.h>
#include <stat.h>
@@ -38,6 +38,8 @@ extern "C" {
#include <lualib.h>
} /* extern "C" */
+#include "lua/utils.h"
+
static void
fill_stat_item(struct lua_State *L, int rps, int64_t total)
{
@@ -105,18 +107,18 @@ static const struct luaL_reg lbox_stat_meta [] = {
/** Initialize bos.stat package. */
void
-tarantool_lua_stat_init(struct lua_State *L)
+box_lua_stat_init(struct lua_State *L)
{
- lua_getfield(L, LUA_GLOBALSINDEX, "box");
+ static const struct luaL_reg statlib [] = {
+ {NULL, NULL}
+ };
- lua_pushstring(L, "stat");
- lua_newtable(L);
+ luaL_register(L, "box.stat", statlib);
lua_newtable(L);
luaL_register(L, NULL, lbox_stat_meta);
lua_setmetatable(L, -2);
- lua_settable(L, -3); /* box.stat = created table */
- lua_pop(L, 1); /* cleanup stack */
+ lua_pop(L, 1); /* stat module */
}
diff --git a/src/lua/stat.h b/src/box/lua/stat.h
similarity index 96%
rename from src/lua/stat.h
rename to src/box/lua/stat.h
index a9ba3148b7bcd7d71746166445a57d443daedaac..21b684c0072ec38181765e8ef3457b52e04ce0eb 100644
--- a/src/lua/stat.h
+++ b/src/box/lua/stat.h
@@ -30,6 +30,6 @@
*/
struct lua_State;
-void tarantool_lua_stat_init(struct lua_State *L);
+void box_lua_stat_init(struct lua_State *L);
#endif /* INCLUDES_TARANTOOL_LUA_STAT_H */
diff --git a/src/box/lua/tuple.lua b/src/box/lua/tuple.lua
index ffa0d7b22b595413efb1e7e83e93b6b77e5d899e..74418cdeabd771aeba135ca0be7faa841f8a792e 100644
--- a/src/box/lua/tuple.lua
+++ b/src/box/lua/tuple.lua
@@ -1,8 +1,8 @@
-- tuple.lua (internal file)
local ffi = require('ffi')
-local yaml = require('box.yaml')
-local msgpackffi = require('box.msgpackffi')
+local yaml = require('yaml')
+local msgpackffi = require('msgpackffi')
local fun = require('fun')
ffi.cdef([[
diff --git a/src/lua/admin.cc b/src/lua/admin.cc
deleted file mode 100644
index 615730d8e278a1b43651af45228d25729fc90796..0000000000000000000000000000000000000000
--- a/src/lua/admin.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * 1. Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the
- * following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * <COPYRIGHT HOLDER> OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "lua/admin.h"
-
-extern "C" {
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-}
-
-#include "trivia/util.h"
-#include "box/box.h"
-
-static int
-lbox_save_coredump(struct lua_State *L __attribute__((unused)))
-{
- coredump(60);
- lua_pushstring(L, "ok");
- return 1;
-}
-
-static int
-lbox_save_snapshot(struct lua_State *L)
-{
- int ret = box_snapshot();
- if (ret == 0) {
- lua_pushstring(L, "ok");
- return 1;
- }
- luaL_error(L, "can't save snapshot, errno %d (%s)",
- ret, strerror(ret));
- return 1;
-}
-
-int tarantool_lua_admin_init(struct lua_State *L)
-{
- lua_getfield(L, LUA_GLOBALSINDEX, "box");
- lua_pushstring(L, "snapshot");
- lua_pushcfunction(L, lbox_save_snapshot);
- lua_settable(L, -3);
-
- lua_pushstring(L, "coredump");
- lua_pushcfunction(L, lbox_save_coredump);
- lua_settable(L, -3);
-
- lua_pop(L, 1);
- return 0;
-}
diff --git a/src/lua/admin.h b/src/lua/admin.h
deleted file mode 100644
index 54e6c1b793ae4d5cc2a91986293adca3c8046665..0000000000000000000000000000000000000000
--- a/src/lua/admin.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef TARANTOOL_LUA_ADMIN_H_INCLUDED
-#define TARANTOOL_LUA_ADMIN_H_INCLUDED
-/*
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * 1. Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the
- * following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * <COPYRIGHT HOLDER> OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-struct lua_State;
-/**
-* Initialize lua admin bindings
-*/
-int tarantool_lua_admin_init(struct lua_State *L);
-
-#endif /* TARANTOOL_LUA_ADMIN_H_INCLUDED */
diff --git a/src/lua/bsdsocket.cc b/src/lua/bsdsocket.cc
index fb31387991677aadef5cafaf27ef36231dcbc02d..42896ba21ba2b6363ceec183b24acd926f3aa65c 100644
--- a/src/lua/bsdsocket.cc
+++ b/src/lua/bsdsocket.cc
@@ -840,7 +840,7 @@ tarantool_lua_bsdsocket_init(struct lua_State *L)
{ NULL, NULL }
};
- luaL_register_module(L, "box.socket.internal", internal_methods);
+ luaL_register_module(L, "socket.internal", internal_methods);
/* domains table */
lua_pushliteral(L, "DOMAIN");
@@ -915,7 +915,7 @@ tarantool_lua_bsdsocket_init(struct lua_State *L)
lua_pushinteger(L, SOL_SOCKET);
lua_rawset(L, -3);
- lua_pop(L, 1); /* box.socket.internal */
+ lua_pop(L, 1); /* socket.internal */
if (luaL_dostring(L, bsdsocket_lua))
panic("Error loading Lua source (internal)/bsdsocket.lua: %s",
diff --git a/src/lua/bsdsocket.lua b/src/lua/bsdsocket.lua
index 707c333bfd0aeaef4048dbfb2ef0a913581810c9..366df5c702adf45e5e55d482c8f6e206d964460a 100644
--- a/src/lua/bsdsocket.lua
+++ b/src/lua/bsdsocket.lua
@@ -4,10 +4,10 @@ do
local TIMEOUT_INFINITY = 500 * 365 * 86400
-local ffi = require 'ffi'
-local boxerrno = require('box.errno')
-local internal = require('box.socket.internal')
-local boxfiber = require('box.fiber')
+local ffi = require('ffi')
+local boxerrno = require('errno')
+local internal = require('socket.internal')
+local boxfiber = require('fiber')
ffi.cdef[[
typedef uint32_t socklen_t;
@@ -855,10 +855,10 @@ socket_mt = {
end
}
-if package.loaded['box.socket'] == nil then
- package.loaded['box.socket'] = {}
+if package.loaded['socket'] == nil then
+ package.loaded['socket'] = {}
end
-setmetatable(package.loaded['box.socket'], {
+setmetatable(package.loaded['socket'], {
__call = create_socket,
__index = {
getaddrinfo = getaddrinfo,
diff --git a/src/lua/cjson.cc b/src/lua/cjson.cc
index 9d85a4e0a2579d652a47ca60092b1b58125768c8..d1f3a3269515cb013ffdf463ae9259baeffe5f3d 100644
--- a/src/lua/cjson.cc
+++ b/src/lua/cjson.cc
@@ -35,7 +35,7 @@ extern "C" {
int luaopen_cjson(lua_State *l);
}
-static const char jsonlib_name[] = "box.json";
+static const char jsonlib_name[] = "json";
int
tarantool_lua_cjson_init(struct lua_State *L)
diff --git a/src/lua/cjson.h b/src/lua/cjson.h
index 9df3d97ac4c2a2b168e7a4d2d98fd332d703e2ba..a5d4ee4c1f1900d933c47e9c3cd8ea89c1690983 100644
--- a/src/lua/cjson.h
+++ b/src/lua/cjson.h
@@ -31,7 +31,7 @@
struct lua_State;
/**
-* Initialize box.cjson system
+* Initialize json system
*/
int tarantool_lua_cjson_init(struct lua_State *L);
diff --git a/src/lua/digest.lua b/src/lua/digest.lua
index f40b1a93eabf7b8c2b9b5534e90a137edb180f74..7ff658fb28c44e14b7d4661f683a687b8a9d1e77 100644
--- a/src/lua/digest.lua
+++ b/src/lua/digest.lua
@@ -1,4 +1,4 @@
--- box.digest.lua (internal file)
+-- digest.lua (internal file)
do
diff --git a/src/lua/errinj.cc b/src/lua/errinj.cc
index 6a59538a8aa36b805e897b9122f408cf3294d703..7425035d79728ddf7410d259dff9fbbb4e6d7ec5 100644
--- a/src/lua/errinj.cc
+++ b/src/lua/errinj.cc
@@ -81,6 +81,6 @@ static const struct luaL_reg errinjlib[] = {
void
tarantool_lua_errinj_init(struct lua_State *L)
{
- luaL_register(L, "box.errinj", errinjlib);
+ luaL_register(L, "errinj", errinjlib);
lua_pop(L, 1);
}
diff --git a/src/lua/errno.c b/src/lua/errno.c
index 34356448085d18cc6226f2008e32b28760111848..afd24e9bfac490a9e168740d2859ba6dae799e8f 100644
--- a/src/lua/errno.c
+++ b/src/lua/errno.c
@@ -285,7 +285,7 @@ tarantool_lua_errno_init(struct lua_State *L)
const luaL_reg errnolib[] = {
{ NULL, NULL}
};
- luaL_register_module(L, "box.errno", errnolib);
+ luaL_register_module(L, "errno", errnolib);
for (int i = 0; elist[i].name[0]; i++) {
lua_pushstring(L, elist[i].name);
lua_pushinteger(L, elist[i].value);
diff --git a/src/lua/errno.lua b/src/lua/errno.lua
index de8d337babca7f51b82e21a561e487f13757dbf1..bda3096052a16adb617cc4bae292e9cbf8245390 100644
--- a/src/lua/errno.lua
+++ b/src/lua/errno.lua
@@ -10,7 +10,7 @@ ffi.cdef[[
int errno_set(int new_errno);
]]
-local exports = require('box.errno')
+local exports = require('errno')
exports.strerror = function(errno)
if errno == nil then
errno = ffi.C.errno_get()
diff --git a/src/lua/fiber.cc b/src/lua/fiber.cc
index 6196ba498ff8483a3b741d46d394d1af858ad29c..6498e8eb97ea63536181baf70e34757ae9a4e2c0 100644
--- a/src/lua/fiber.cc
+++ b/src/lua/fiber.cc
@@ -44,25 +44,25 @@ extern "C" {
/* {{{ box.fiber Lua library: access to Tarantool fibers
*
* Each fiber can be running, suspended or dead.
- * A fiber is created (box.fiber.create()) suspended.
- * It can be started with box.fiber.resume(), yield
- * the control back with box.fiber.yield() end
+ * A fiber is created (fiber.create()) suspended.
+ * It can be started with fiber.resume(), yield
+ * the control back with fiber.yield() end
* with return or just by reaching the end of the
* function.
*
* A fiber can also be attached or detached.
* An attached fiber is a child of the creator,
* and is running only if the creator has called
- * box.fiber.resume(). A detached fiber is a child of
+ * fiber.resume(). A detached fiber is a child of
* Tarntool/Box internal 'sched' fiber, and gets
* scheduled only if there is a libev event associated
* with it.
* To detach itself, a running fiber must invoke
- * box.fiber.detach().
+ * fiber.detach().
* A detached fiber loses connection with its parent
* forever.
*
- * All fibers are part of the fiber registry, box.fiber.
+ * All fibers are part of the fiber registry, fiber.
* This registry can be searched either by
* fiber id (fid), which is numeric, or by fiber name,
* which is a string. If there is more than one
@@ -87,11 +87,11 @@ extern "C" {
* The other potential problem comes from detached
* fibers which never get scheduled, because are subscribed
* or get no events. Such morphing fibers can be killed
- * with box.fiber.cancel(), since box.fiber.cancel()
+ * with fiber.cancel(), since fiber.cancel()
* sends an asynchronous wakeup event to the fiber.
*/
-static const char *fiberlib_name = "box.fiber";
+static const char *fiberlib_name = "fiber";
enum fiber_state { DONE, YIELD, DETACH };
@@ -615,7 +615,7 @@ lbox_fiber_yield(struct lua_State *L)
fiber_setcancellable(false);
/*
* Got resumed. Return whatever the caller has passed
- * to us with box.fiber.resume().
+ * to us with fiber.resume().
* As a side effect, the detached fiber which yields
* to sched always gets back whatever it yields.
*/
diff --git a/src/lua/init.cc b/src/lua/init.cc
index 56ef1b8bffec3aeef6325ef7c5631d63bff1933f..9e569b8472cc1b0ac37f3e06a402f39f88beb34f 100644
--- a/src/lua/init.cc
+++ b/src/lua/init.cc
@@ -46,14 +46,11 @@ extern "C" {
#include <fiber.h>
#include "coeio.h"
#include "lua/fiber.h"
-#include "lua/admin.h"
#include "lua/errinj.h"
#include "lua/ipc.h"
#include "lua/errno.h"
#include "lua/socket.h"
#include "lua/bsdsocket.h"
-#include "lua/info.h"
-#include "lua/stat.h"
#include "lua/session.h"
#include "lua/cjson.h"
#include "lua/yaml.h"
@@ -71,10 +68,10 @@ struct lua_State *tarantool_L;
extern char uuid_lua[], session_lua[], msgpackffi_lua[], fun_lua[],
load_cfg_lua[], interactive_lua[], digest_lua[], init_lua[];
static const char *lua_sources[] = { init_lua, session_lua, load_cfg_lua, NULL };
-static const char *lua_modules[] = { "box.msgpackffi", msgpackffi_lua,
- "fun", fun_lua, "box.digest", digest_lua,
- "box.interactive", interactive_lua,
- "box.uuid", uuid_lua, NULL };
+static const char *lua_modules[] = { "msgpackffi", msgpackffi_lua,
+ "fun", fun_lua, "digest", digest_lua,
+ "interactive", interactive_lua,
+ "uuid", uuid_lua, NULL };
/*
* {{{ box Lua library: common functions
*/
@@ -143,6 +140,14 @@ lbox_tonumber64(struct lua_State *L)
return luaL_pushnumber64(L, result);
}
+static int
+lbox_coredump(struct lua_State *L __attribute__((unused)))
+{
+ coredump(60);
+ lua_pushstring(L, "ok");
+ return 1;
+}
+
static const struct luaL_reg errorlib [] = {
{NULL, NULL}
};
@@ -217,14 +222,12 @@ tarantool_lua_init(const char *tarantool_bin, int argc, char **argv)
tarantool_lua_setpath(L, "cpath", MODULE_LIBPATH, NULL);
lua_register(L, "tonumber64", lbox_tonumber64);
+ lua_register(L, "coredump", lbox_coredump);
tarantool_lua_errinj_init(L);
tarantool_lua_fiber_init(L);
- tarantool_lua_admin_init(L);
tarantool_lua_cjson_init(L);
tarantool_lua_yaml_init(L);
- tarantool_lua_info_init(L);
- tarantool_lua_stat_init(L);
tarantool_lua_ipc_init(L);
tarantool_lua_errno_init(L);
tarantool_lua_socket_init(L);
@@ -434,9 +437,9 @@ run_script(va_list ap)
lua_pushstring(L, path);
} else {
say_crit("version %s", tarantool_version());
- /* get box.iteractive from package.loaded */
+ /* get iteractive from package.loaded */
lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
- lua_getfield(L, -1, "box.interactive");
+ lua_getfield(L, -1, "interactive");
lua_remove(L, -2); /* remove package.loaded */
}
try {
diff --git a/src/lua/ipc.cc b/src/lua/ipc.cc
index 68900afedd57dcc645cf95d2321443f0a9d83ef6..8ba6ad10fd8979d780497b415b0d4dd62b40f6dd 100644
--- a/src/lua/ipc.cc
+++ b/src/lua/ipc.cc
@@ -276,6 +276,6 @@ tarantool_lua_ipc_init(struct lua_State *L)
{NULL, NULL}
};
- luaL_register_module(L, "box.fiber", ipc_meta);
+ luaL_register_module(L, "fiber", ipc_meta);
lua_pop(L, 1);
}
diff --git a/src/lua/msgpack.cc b/src/lua/msgpack.cc
index b49bb75c66a218b0ec658fd3354911f1e498592b..0ce4a321e8e7a06b38811e9ed552c19452a9d957 100644
--- a/src/lua/msgpack.cc
+++ b/src/lua/msgpack.cc
@@ -416,6 +416,6 @@ luaopen_msgpack(lua_State *L)
{ NULL, NULL}
};
- luaL_register_module(L, "box.msgpack", msgpacklib);
+ luaL_register_module(L, "msgpack", msgpacklib);
return 1;
}
diff --git a/src/lua/session.cc b/src/lua/session.cc
index fca6dacb8d73e20096b4b9f40de26709fbf9d262..7ebff5cfb2bdad92daa97c7b14f62d77ebf78077 100644
--- a/src/lua/session.cc
+++ b/src/lua/session.cc
@@ -41,7 +41,7 @@ extern "C" {
#include <session.h>
#include <sio.h>
-static const char *sessionlib_name = "box.session";
+static const char *sessionlib_name = "session";
/**
* Return a unique monotonic session
@@ -196,7 +196,7 @@ session_storage_cleanup(int sid)
lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
if (!lua_istable(L, -1))
goto exit;
- lua_getfield(L, -1, "box.session");
+ lua_getfield(L, -1, "session");
if (!lua_istable(L, -1))
goto exit;
lua_getmetatable(L, -1);
diff --git a/src/lua/session.lua b/src/lua/session.lua
index 58a973875b04d4491a34735be259f0dbcd47eee3..62b91bec9a0617a3322ef942d572841086b37b30 100644
--- a/src/lua/session.lua
+++ b/src/lua/session.lua
@@ -1,15 +1,15 @@
--- box.session.lua
+-- session.lua
-local boxsession = require('box.session')
+local session = require('session')
-setmetatable(boxsession, {
+setmetatable(session, {
__index = function(tbl, idx)
if idx ~= 'storage' then
return
end
- local sid = boxsession.id()
+ local sid = session.id()
local mt = getmetatable(tbl)
diff --git a/src/lua/socket.cc b/src/lua/socket.cc
index 3c3623de93ed31e23a7747bba947d00ad5590082..4938ce7624becc58158d022e25624c7cbbdc2dac 100644
--- a/src/lua/socket.cc
+++ b/src/lua/socket.cc
@@ -52,7 +52,7 @@ extern "C" {
#include <stdlib.h>
#include <mutex.h>
-static const char socketlib_name[] = "box.socket";
+static const char socketlib_name[] = "socket";
/**
* gethostbyname(), getaddrinfo() and friends do not use
@@ -107,7 +107,7 @@ bio_checksocket(struct lua_State *L, int narg)
{
/* avoiding unnecessary luajit assert */
if (lua_gettop(L) < narg)
- luaL_error(L, "box.socket: incorrect method call");
+ luaL_error(L, "socket: incorrect method call");
return (struct bio_socket *) luaL_checkudata(L, narg, socketlib_name);
}
@@ -116,7 +116,7 @@ bio_checkactivesocket(struct lua_State *L, int narg)
{
struct bio_socket *s = bio_checksocket(L, narg);
if (! evio_is_active(&s->io_w))
- luaL_error(L, "box.socket: socket is not initialized");
+ luaL_error(L, "socket: socket is not initialized");
return s;
}
@@ -138,7 +138,7 @@ bio_initbuf(struct bio_socket *s)
assert(s->iob == NULL);
char name[FIBER_NAME_MAX];
const char *type = s->socktype == SOCK_STREAM ? "tcp" : "udp";
- snprintf(name, sizeof(name), "box.io.%s(%d)",
+ snprintf(name, sizeof(name), "socket.%s(%d)",
type, s->io_w.fd);
s->iob = iobuf_new(name);
}
@@ -213,7 +213,7 @@ lbox_socket_tostring(struct lua_State *L)
}
/**
- * box.io.tcp()
+ * socket.tcp()
*
* Create SOCK_STREAM socket object.
*/
@@ -224,7 +224,7 @@ lbox_socket_tcp(struct lua_State *L)
}
/**
- * box.io.udp()
+ * socket.udp()
*
* Create SOCK_DGRAM socket object.
*/
@@ -496,7 +496,7 @@ readline_state_init(struct lua_State *L, struct readline_state *rs, int idx)
rs[i].pos = 0;
rs[i].sep = luaL_checklstring(L, -1, &rs[i].sep_size);
if (rs[i].sep_size == 0)
- luaL_error(L, "box.io.readline: bad separator");
+ luaL_error(L, "socket.readline: bad separator");
lua_pop(L, 1);
i++;
}
@@ -551,7 +551,7 @@ lbox_socket_readline_opts(struct lua_State *L, unsigned int *limit,
lbox_socket_readline_cr(L);
seplist = 3;
} else if (! lua_istable(L, 2))
- luaL_error(L, "box.io.readline: bad argument");
+ luaL_error(L, "socket.readline: bad argument");
break;
case 3:
/* readline(limit, timeout)
@@ -565,11 +565,11 @@ lbox_socket_readline_opts(struct lua_State *L, unsigned int *limit,
seplist = 4;
break;
} else if (! lua_istable(L, 3))
- luaL_error(L, "box.io.readline: bad argument");
+ luaL_error(L, "socket.readline: bad argument");
seplist = 3;
break;
} else if (! lua_istable(L, 2))
- luaL_error(L, "box.io.readline: bad argument");
+ luaL_error(L, "socket.readline: bad argument");
*timeout = luaL_checknumber(L, 3);
seplist = 2;
break;
@@ -577,12 +577,12 @@ lbox_socket_readline_opts(struct lua_State *L, unsigned int *limit,
/* readline(limit, {seplist}, timeout) */
*limit = luaL_checkint(L, 2);
if (! lua_istable(L, 3))
- luaL_error(L, "box.io.readline: bad argument");
+ luaL_error(L, "socket.readline: bad argument");
seplist = 3;
*timeout = luaL_checknumber(L, 4);
break;
default:
- luaL_error(L, "box.io.readline: bad argument");
+ luaL_error(L, "socket.readline: bad argument");
break;
}
return seplist;
@@ -624,7 +624,7 @@ lbox_socket_readline(struct lua_State *L)
int rs_size = lua_objlen(L, seplist);
if (rs_size == 0)
- luaL_error(L, "box.io.readline: bad separator table");
+ luaL_error(L, "socket.readline: bad separator table");
/* acquire read lock */
ev_tstamp start, delay;
diff --git a/src/lua/yaml.cc b/src/lua/yaml.cc
index 20186c99bee1a7e3111288891163d4a26dfb67f3..a909c7894b47d9c569a46f2134d83f37f3bc4663 100644
--- a/src/lua/yaml.cc
+++ b/src/lua/yaml.cc
@@ -35,15 +35,11 @@ extern "C" {
int luaopen_yaml(lua_State *l);
}
-static const char yamllib_name[] = "box.yaml";
-
int
tarantool_lua_yaml_init(struct lua_State *L)
{
- lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
luaopen_yaml(L);
- lua_setfield(L, -2, yamllib_name);
- lua_pop(L, 1); /* package.loaded */
+ lua_pop(L, 1); /* yaml module */
/* Remove global variable */
lua_pushnil(L);
lua_setfield(L, LUA_GLOBALSINDEX, "yaml");
diff --git a/src/module/sql/sql.lua b/src/module/sql/sql.lua
index 4b014c2a32e3166246860752292e1a4f3ad58097..89266845d0829b01702cbc2749b436092ce3fcdc 100644
--- a/src/module/sql/sql.lua
+++ b/src/module/sql/sql.lua
@@ -1,5 +1,7 @@
-- sql.lua (internal file)
+local fiber = require('fiber')
+
box.net.sql = {
-- constructor
-- box.net.sql.connect(
@@ -92,9 +94,9 @@ box.net.sql = {
execute = function(self, sql, ...)
-- waits until connection will be free
while self.processing do
- self.queue[ box.fiber.id() ] = box.ipc.channel()
- self.queue[ box.fiber.id() ]:get()
- self.queue[ box.fiber.id() ] = nil
+ self.queue[ fiber.id() ] = fiber.channel()
+ self.queue[ fiber.id() ]:get()
+ self.queue[ fiber.id() ] = nil
end
self.processing = true
diff --git a/test/big/iterator.result b/test/big/iterator.result
index e23d7e819bcb9ad6003257200e3df59a094ad75a..d65125ffb86ed64444ed18960cec701f67231eec 100644
--- a/test/big/iterator.result
+++ b/test/big/iterator.result
@@ -891,7 +891,7 @@ space.index['primary']:pairs({}, {iterator = -666 })
-- Test cases for #123: box.index.count does not check arguments properly
space.index['primary']:pairs(function() end, { iterator = box.index.EQ })
---
-- error: 'builtin/box.msgpackffi.lua:261: can not encode Lua type: ''function'''
+- error: 'builtin/msgpackffi.lua:261: can not encode Lua type: ''function'''
...
space:drop()
---
diff --git a/test/big/lua.result b/test/big/lua.result
index 489d724759fb9dc81013cbd52b66901dddedae61..e345fbf4999a8d0baf6f2af8601f9cca15c3ccd5 100644
--- a/test/big/lua.result
+++ b/test/big/lua.result
@@ -574,7 +574,7 @@ space.index['i1']:count()
-- Test cases for #123: box.index.count does not check arguments properly
space.index['i1']:count(function() end)
---
-- error: 'builtin/box.msgpackffi.lua:261: can not encode Lua type: ''function'''
+- error: 'builtin/msgpackffi.lua:261: can not encode Lua type: ''function'''
...
space:drop()
---
diff --git a/test/box/access.result b/test/box/access.result
index d98a5b90193fcc94a2b54a155c8de6d3ec526d60..8e0f501e8126336c63ac53dac2ecb3651aa12bd5 100644
--- a/test/box/access.result
+++ b/test/box/access.result
@@ -1,23 +1,23 @@
-box.session = require('box.session')
+session = require('session')
---
...
-- user id for a Lua session is admin - 1
-box.session.uid()
+session.uid()
---
- 1
...
-- extra arguments are ignored
-box.session.uid(nil)
+session.uid(nil)
---
- 1
...
-- admin
-box.session.user()
+session.user()
---
- admin
...
-- extra argumentes are ignored
-box.session.user(nil)
+session.user(nil)
---
- admin
...
@@ -38,7 +38,7 @@ box.schema.user.create('test', { password = 'test' })
-- su() let's you change the user of the session
-- the user will be unabe to change back unless he/she
-- is granted access to 'su'
-box.session.su('test')
+session.su('test')
---
...
-- you can't create spaces unless you have a write access on
@@ -51,7 +51,7 @@ box.schema.create_space('test')
-- su() goes through because called from admin
-- console, and it has no access checks
-- for functions
-box.session.su('admin')
+session.su('admin')
---
...
box.schema.user.grant('test', 'write', 'space', '_space')
@@ -91,16 +91,16 @@ box.schema.user.create('rich')
box.schema.user.grant('rich', 'read,write', 'universe')
---
...
-box.session.su('rich')
+session.su('rich')
---
...
-uid = box.session.uid()
+uid = session.uid()
---
...
box.schema.func.create('dummy')
---
...
-box.session.su('admin')
+session.su('admin')
---
...
box.space['_user']:delete{uid}
@@ -124,7 +124,7 @@ box.space['_user']:delete{uid}
box.schema.user.drop('test')
---
...
-box.session = nil
+session = nil
---
...
--------------------------------------------------------------------------------
diff --git a/test/box/access.test.lua b/test/box/access.test.lua
index 76bd077e99617e5e7d15a3cf219d91da18dc4f79..641d72f4eaf06d3bb2a02c4ef49a8c01428b49c0 100644
--- a/test/box/access.test.lua
+++ b/test/box/access.test.lua
@@ -1,12 +1,12 @@
-box.session = require('box.session')
+session = require('session')
-- user id for a Lua session is admin - 1
-box.session.uid()
+session.uid()
-- extra arguments are ignored
-box.session.uid(nil)
+session.uid(nil)
-- admin
-box.session.user()
+session.user()
-- extra argumentes are ignored
-box.session.user(nil)
+session.user(nil)
-- password() is a function which returns base64(sha1(sha1(password))
-- a string to store in _user table
box.schema.user.password('test')
@@ -16,7 +16,7 @@ box.schema.user.create('test', { password = 'test' })
-- su() let's you change the user of the session
-- the user will be unabe to change back unless he/she
-- is granted access to 'su'
-box.session.su('test')
+session.su('test')
-- you can't create spaces unless you have a write access on
-- system space _space
-- in future we may introduce a separate privilege
@@ -24,7 +24,7 @@ box.schema.create_space('test')
-- su() goes through because called from admin
-- console, and it has no access checks
-- for functions
-box.session.su('admin')
+session.su('admin')
box.schema.user.grant('test', 'write', 'space', '_space')
--# setopt delimiter ';'
@@ -47,17 +47,17 @@ usermax();
--# setopt delimiter ''
box.schema.user.create('rich')
box.schema.user.grant('rich', 'read,write', 'universe')
-box.session.su('rich')
-uid = box.session.uid()
+session.su('rich')
+uid = session.uid()
box.schema.func.create('dummy')
-box.session.su('admin')
+session.su('admin')
box.space['_user']:delete{uid}
box.schema.func.drop('dummy')
box.space['_user']:delete{uid}
box.schema.user.revoke('rich', 'read,write', 'universe')
box.space['_user']:delete{uid}
box.schema.user.drop('test')
-box.session = nil
+session = nil
--------------------------------------------------------------------------------
-- #198: names like '' and 'x.y' and 5 and 'primary ' are legal
diff --git a/test/box/admin.result b/test/box/admin.result
index 953d33c37c425f70a1c1bb7f9a16e07ece5583b3..9c6cb093d852fbe40c7bf991eb5750811bc50ef7 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -216,7 +216,7 @@ function test_fiber(tbl)
local num = {'fid', 'csw'}
for k, v in ipairs(num) do
if check_type(tmp[v], 'number') == false then
- table.insert(failed, "require('box.fiber').info().<fiber_name>."..v)
+ table.insert(failed, "require('fiber').info().<fiber_name>."..v)
else
tmp[v] = nil
end
@@ -235,7 +235,7 @@ end;
---
...
function test_box_fiber_info()
- local tmp = require('box.fiber').info()
+ local tmp = require('fiber').info()
local failed = {}
for name, tbl in ipairs(tmp) do
local bl, fld = test_fiber(tbl)
@@ -248,9 +248,9 @@ function test_box_fiber_info()
end
end
if #tmp > 0 or #failed > 0 then
- return "require('box.fiber').info is not ok. failed: ", tmp, failed
+ return "require('fiber').info is not ok. failed: ", tmp, failed
else
- return "require('box.fiber').info() is ok"
+ return "require('fiber').info() is ok"
end
end;
---
@@ -265,7 +265,7 @@ test_box_slab_info();
...
test_box_fiber_info();
---
-- require('box.fiber').info() is ok
+- require('fiber').info() is ok
...
space:drop();
---
diff --git a/test/box/admin.test.lua b/test/box/admin.test.lua
index c6904428cf628582eb0d955e5208e8187ed510af..581833ae207fe152316a9ba2a8348c1b897a5d16 100644
--- a/test/box/admin.test.lua
+++ b/test/box/admin.test.lua
@@ -122,7 +122,7 @@ function test_fiber(tbl)
local num = {'fid', 'csw'}
for k, v in ipairs(num) do
if check_type(tmp[v], 'number') == false then
- table.insert(failed, "require('box.fiber').info().<fiber_name>."..v)
+ table.insert(failed, "require('fiber').info().<fiber_name>."..v)
else
tmp[v] = nil
end
@@ -140,7 +140,7 @@ function test_fiber(tbl)
end;
function test_box_fiber_info()
- local tmp = require('box.fiber').info()
+ local tmp = require('fiber').info()
local failed = {}
for name, tbl in ipairs(tmp) do
local bl, fld = test_fiber(tbl)
@@ -153,9 +153,9 @@ function test_box_fiber_info()
end
end
if #tmp > 0 or #failed > 0 then
- return "require('box.fiber').info is not ok. failed: ", tmp, failed
+ return "require('fiber').info is not ok. failed: ", tmp, failed
else
- return "require('box.fiber').info() is ok"
+ return "require('fiber').info() is ok"
end
end;
diff --git a/test/box/admin_coredump.result b/test/box/admin_coredump.result
index 8f9130970e9ac66a504b3deee15d6ceb1fb014f5..e3a3cbf313696772a46ff8416354f34bc4f3d41b 100644
--- a/test/box/admin_coredump.result
+++ b/test/box/admin_coredump.result
@@ -1,6 +1,6 @@
-- moved to separate test because this test fail in the valgrind mode (coredump
-- process terminated via abort procedure)
-box.coredump()
+coredump()
---
- ok
...
diff --git a/test/box/admin_coredump.test.lua b/test/box/admin_coredump.test.lua
index aadbb6367dd3049f1d0bbfade4f3e37866fdc65c..19b591f896bcee87fd81a20a6659118d9b9a8589 100644
--- a/test/box/admin_coredump.test.lua
+++ b/test/box/admin_coredump.test.lua
@@ -1,3 +1,3 @@
-- moved to separate test because this test fail in the valgrind mode (coredump
-- process terminated via abort procedure)
-box.coredump()
+coredump()
diff --git a/test/box/auth_access.result b/test/box/auth_access.result
index 14544a83a7a25a0ff6026779ea0ac7b4d5a6dfd3..7da350e0320b04cf7a0d26e61554ec2b05afa641 100644
--- a/test/box/auth_access.result
+++ b/test/box/auth_access.result
@@ -1,4 +1,4 @@
-box.session = require('box.session')
+session = require('session')
---
...
--
@@ -54,7 +54,7 @@ box.schema.user.grant('testus', 'read', 'space', 'admin_space')
box.schema.user.grant('testus', 'read', 'space', 'admin_space')
---
...
-box.session.su('testus')
+session.su('testus')
---
...
s:select(1)
@@ -76,7 +76,7 @@ s:drop()
--
-- Check double revoke
--
-box.session.su('admin')
+session.su('admin')
---
...
box.schema.user.revoke('testus', 'read', 'space', 'admin_space')
@@ -85,14 +85,14 @@ box.schema.user.revoke('testus', 'read', 'space', 'admin_space')
box.schema.user.revoke('testus', 'read', 'space', 'admin_space')
---
...
-box.session.su('testus')
+session.su('testus')
---
...
s:select(1)
---
- error: Read access denied for user 'testus' to space 'admin_space'
...
-box.session.su('admin')
+session.su('admin')
---
...
--
@@ -101,7 +101,7 @@ box.session.su('admin')
box.schema.user.grant('testus', 'write', 'space', 'admin_space')
---
...
-box.session.su('testus')
+session.su('testus')
---
...
s:select(1)
@@ -120,7 +120,7 @@ s:drop()
---
- error: Read access denied for user 'testus' to space '_index'
...
-box.session.su('admin')
+session.su('admin')
---
...
--
@@ -136,10 +136,10 @@ box.schema.user.drop('testus')
--
-- Check 'guest' user
--
-box.session.su('guest')
+session.su('guest')
---
...
-box.session.uid()
+session.uid()
---
- 0
...
@@ -171,7 +171,7 @@ box.schema.func.create('guest_func')
---
- error: Read access denied for user 'guest' to space '_func'
...
-box.session.su('admin')
+session.su('admin')
---
...
s:select()
@@ -189,10 +189,10 @@ box.schema.user.create('uniuser')
box.schema.user.grant('uniuser', 'read, write, execute', 'universe')
---
...
-box.session.su('uniuser')
+session.su('uniuser')
---
...
-if box.session.uid() < 2 then return 'uid error' end
+if session.uid() < 2 then return 'uid error' end
---
...
--
@@ -260,7 +260,7 @@ us = box.schema.create_space('uniuser_space')
box.schema.func.create('uniuser_func')
---
...
-box.session.su('admin')
+session.su('admin')
---
...
box.schema.user.create('someuser')
@@ -269,7 +269,7 @@ box.schema.user.create('someuser')
box.schema.user.grant('someuser', 'read, write, execute', 'universe')
---
...
-box.session.su('someuser')
+session.su('someuser')
---
...
--
@@ -291,7 +291,7 @@ box.schema.user.drop('uniuser_testus')
---
- error: Write access denied for user 'someuser'
...
-box.session.su('admin')
+session.su('admin')
---
...
box.schema.func.drop('uniuser_func')
@@ -323,7 +323,7 @@ box.schema.user.create('testuser')
box.schema.user.grant('testuser', 'write', 'space', '_user')
---
...
-box.session.su('testuser')
+session.su('testuser')
---
...
box.space._user:delete(2)
@@ -342,7 +342,7 @@ box.space._user:delete(3)
---
- error: Write access denied for user 'testuser'
...
-box.session.su('admin')
+session.su('admin')
---
...
box.space._user:select(1)
@@ -362,7 +362,7 @@ box.schema.user.revoke('testuser', 'write', 'space', '_user')
box.schema.user.grant('testuser', 'read', 'space', '_user')
---
...
-box.session.su('testuser')
+session.su('testuser')
---
...
box.space._user:delete(2)
@@ -377,7 +377,7 @@ box.space._user:insert{4,'','someone2'}
---
- error: Write access denied for user 'testuser' to space '_user'
...
-box.session.su('admin')
+session.su('admin')
---
...
--
@@ -386,7 +386,7 @@ box.session.su('admin')
box.schema.user.grant('testuser', 'read', 'space', '_index')
---
...
-box.session.su('testuser')
+session.su('testuser')
---
...
box.space._index:select(272)
@@ -397,7 +397,7 @@ box.space._index:insert{512, 1,'owner','tree', 1, 1, 0,'num'}
---
- error: Write access denied for user 'testuser' to space '_index'
...
-box.session.su('admin')
+session.su('admin')
---
...
--
@@ -434,7 +434,7 @@ drop_limit_func();
box.schema.user.grant('testuser', 'read, write, execute', 'universe');
---
...
-box.session.su('testuser');
+session.su('testuser');
---
...
func_limit();
@@ -446,7 +446,7 @@ drop_limit_func();
- error: Function 'func32001' does not exist
...
--# setopt delimiter ''
-box.session.su('admin')
+session.su('admin')
---
...
box.schema.user.revoke('testuser', 'read, write, execute', 'universe')
@@ -494,7 +494,7 @@ t
t = {}
---
...
-box.session.su('testuser')
+session.su('testuser')
---
...
s:select()
@@ -515,13 +515,13 @@ t
t = {}
---
...
-box.session.su('admin')
+session.su('admin')
---
...
box.schema.user.grant('testuser', 'write', 'space', 'glade')
---
...
-box.session.su('testuser')
+session.su('testuser')
---
...
s:select()
@@ -541,13 +541,13 @@ t
t = {}
---
...
-box.session.su('admin')
+session.su('admin')
---
...
box.schema.user.grant('testuser', 'read, write, execute', 'space', 'glade')
---
...
-box.session.su('testuser')
+session.su('testuser')
---
...
s:select()
@@ -568,7 +568,7 @@ t
t = {}
---
...
-box.session.su('guest')
+session.su('guest')
---
...
s:select()
@@ -586,7 +586,7 @@ t
t = {}
---
...
-box.session.su('guest')
+session.su('guest')
---
...
s:select()
@@ -601,7 +601,7 @@ t
- - [3, 'C']
- [4, 'D']
...
-box.session.su('admin')
+session.su('admin')
---
...
s:drop()
@@ -627,6 +627,6 @@ box.space._func:select()
---
- []
...
-box.session = nil
+session = nil
---
...
diff --git a/test/box/auth_access.test.lua b/test/box/auth_access.test.lua
index e118a1a04c43a51341b5de6996d23a587c00a974..b43e92e272485e0a5f3b3ec8a26464f8621a2cf0 100644
--- a/test/box/auth_access.test.lua
+++ b/test/box/auth_access.test.lua
@@ -1,4 +1,4 @@
-box.session = require('box.session')
+session = require('session')
--
-- Check a double create space
--
@@ -25,7 +25,7 @@ s:insert({2})
box.schema.user.grant('testus', 'read', 'space', 'admin_space')
box.schema.user.grant('testus', 'read', 'space', 'admin_space')
-box.session.su('testus')
+session.su('testus')
s:select(1)
s:insert({3})
s:delete(1)
@@ -33,24 +33,24 @@ s:drop()
--
-- Check double revoke
--
-box.session.su('admin')
+session.su('admin')
box.schema.user.revoke('testus', 'read', 'space', 'admin_space')
box.schema.user.revoke('testus', 'read', 'space', 'admin_space')
-box.session.su('testus')
+session.su('testus')
s:select(1)
-box.session.su('admin')
+session.su('admin')
--
-- Check write access on space
--
box.schema.user.grant('testus', 'write', 'space', 'admin_space')
-box.session.su('testus')
+session.su('testus')
s:select(1)
s:delete(1)
s:insert({3})
s:drop()
-box.session.su('admin')
+session.su('admin')
--
-- Check double drop user
--
@@ -59,8 +59,8 @@ box.schema.user.drop('testus')
--
-- Check 'guest' user
--
-box.session.su('guest')
-box.session.uid()
+session.su('guest')
+session.uid()
box.space._user:select(1)
s:select(1)
s:insert({4})
@@ -69,7 +69,7 @@ s:drop()
gs = box.schema.create_space('guest_space')
box.schema.func.create('guest_func')
-box.session.su('admin')
+session.su('admin')
s:select()
--
-- Create user with universe read&write grants
@@ -77,8 +77,8 @@ s:select()
--
box.schema.user.create('uniuser')
box.schema.user.grant('uniuser', 'read, write, execute', 'universe')
-box.session.su('uniuser')
-if box.session.uid() < 2 then return 'uid error' end
+session.su('uniuser')
+if session.uid() < 2 then return 'uid error' end
--
-- Check universal user
-- Check delete currently authenticated user
@@ -111,10 +111,10 @@ box.space._space:select(280)
us = box.schema.create_space('uniuser_space')
box.schema.func.create('uniuser_func')
-box.session.su('admin')
+session.su('admin')
box.schema.user.create('someuser')
box.schema.user.grant('someuser', 'read, write, execute', 'universe')
-box.session.su('someuser')
+session.su('someuser')
--
-- Check drop objects of another user
--
@@ -123,7 +123,7 @@ us:drop()
box.schema.func.drop('uniuser_func')
box.schema.user.drop('uniuser_testus')
-box.session.su('admin')
+session.su('admin')
box.schema.func.drop('uniuser_func')
box.schema.user.drop('someuser')
box.schema.user.drop('uniuser_testus')
@@ -136,13 +136,13 @@ s:drop()
box.schema.user.create('testuser')
box.schema.user.grant('testuser', 'write', 'space', '_user')
-box.session.su('testuser')
+session.su('testuser')
box.space._user:delete(2)
box.space._user:select(1)
box.space._user:insert{3,'','someone'}
box.space._user:delete(3)
-box.session.su('admin')
+session.su('admin')
box.space._user:select(1)
box.space._user:delete(3)
box.schema.user.revoke('testuser', 'write', 'space', '_user')
@@ -150,22 +150,22 @@ box.schema.user.revoke('testuser', 'write', 'space', '_user')
-- Check read grant on _user
--
box.schema.user.grant('testuser', 'read', 'space', '_user')
-box.session.su('testuser')
+session.su('testuser')
box.space._user:delete(2)
box.space._user:select(1)
box.space._user:insert{4,'','someone2'}
-box.session.su('admin')
+session.su('admin')
--
-- Check read grant on _index
--
box.schema.user.grant('testuser', 'read', 'space', '_index')
-box.session.su('testuser')
+session.su('testuser')
box.space._index:select(272)
box.space._index:insert{512, 1,'owner','tree', 1, 1, 0,'num'}
-box.session.su('admin')
+session.su('admin')
--
-- Check max function limit
--
@@ -188,12 +188,12 @@ end;
func_limit();
drop_limit_func();
box.schema.user.grant('testuser', 'read, write, execute', 'universe');
-box.session.su('testuser');
+session.su('testuser');
func_limit();
drop_limit_func();
--# setopt delimiter ''
-box.session.su('admin')
+session.su('admin')
box.schema.user.revoke('testuser', 'read, write, execute', 'universe')
--
-- Check that itertors check privileges
@@ -210,38 +210,38 @@ t = {}
for key, v in s.index.primary:pairs(3, {iterator = 'GE'}) do table.insert (t, v) end
t
t = {}
-box.session.su('testuser')
+session.su('testuser')
s:select()
for key, v in s.index.primary:pairs(3, {iterator = 'GE'}) do table.insert (t, v) end
t
t = {}
-box.session.su('admin')
+session.su('admin')
box.schema.user.grant('testuser', 'write', 'space', 'glade')
-box.session.su('testuser')
+session.su('testuser')
s:select()
for key, v in s.index.primary:pairs(1, {iterator = 'GE'}) do table.insert (t, v) end
t
t = {}
-box.session.su('admin')
+session.su('admin')
box.schema.user.grant('testuser', 'read, write, execute', 'space', 'glade')
-box.session.su('testuser')
+session.su('testuser')
s:select()
for key, v in s.index.primary:pairs(3, {iterator = 'GE'}) do table.insert (t, v) end
t
t = {}
-box.session.su('guest')
+session.su('guest')
s:select()
for key, v in s.index.primary:pairs(3, {iterator = 'GE'}) do table.insert (t, v) end
t
t = {}
-box.session.su('guest')
+session.su('guest')
s:select()
for key, v in s.index.primary:pairs(3, {iterator = 'GE'}) do table.insert (t, v) end
t
-box.session.su('admin')
+session.su('admin')
s:drop()
@@ -249,4 +249,4 @@ box.space._user:select()
box.space._space:select()
box.space._func:select()
-box.session = nil
+session = nil
diff --git a/test/box/bad_trigger.result b/test/box/bad_trigger.result
index 216ee4b9fd74602e395129225142a78a2ff3f097..085f824ca86d657289c27709b2b194e54525cb9f 100644
--- a/test/box/bad_trigger.result
+++ b/test/box/bad_trigger.result
@@ -6,7 +6,7 @@
function f1() nosuchfunction() end
---
...
-require('box.session').on_connect(f1)
+require('session').on_connect(f1)
---
...
greeting: True
@@ -14,6 +14,6 @@ fixheader: True
error code: 8194
error message: [string "function f1() nosuchfunction() end"]:1: attempt to call global 'nosuchfunction' (a nil value)
eof: True
-require('box.session').on_connect(nil, f1)
+require('session').on_connect(nil, f1)
---
...
diff --git a/test/box/bad_trigger.test.py b/test/box/bad_trigger.test.py
index c2dc1c189c1265850b939e5e67aff660260e812d..b1676c42a1193655af7005c638faa3d2c3e87912 100644
--- a/test/box/bad_trigger.test.py
+++ b/test/box/bad_trigger.test.py
@@ -11,7 +11,7 @@ print """
"""
server.admin("function f1() nosuchfunction() end")
-server.admin("require('box.session').on_connect(f1)")
+server.admin("require('session').on_connect(f1)")
unpacker = msgpack.Unpacker(use_list = False)
@@ -38,4 +38,4 @@ print 'error message: ', body[IPROTO_ERROR]
print 'eof:', len(s.recv(1024)) == 0
s.close()
-server.admin("require('box.session').on_connect(nil, f1)")
+server.admin("require('session').on_connect(nil, f1)")
diff --git a/test/box/bsdsocket.result b/test/box/bsdsocket.result
index 6547b5e657ceb963a109fc24caf8137cee7a83cc..111e22bc3692a980f357031ae20ae4e5fb201978 100644
--- a/test/box/bsdsocket.result
+++ b/test/box/bsdsocket.result
@@ -1,18 +1,18 @@
-json = require('box.json')
+json = require('json')
---
...
-boxsocket = require('box.socket')
+socket = require('socket')
---
...
-type(boxsocket)
+type(socket)
---
- table
...
-boxsocket('PF_INET', 'SOCK_STREAM', 'tcp121222');
+socket('PF_INET', 'SOCK_STREAM', 'tcp121222');
---
- null
...
-s = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+s = socket('PF_INET', 'SOCK_STREAM', 'tcp')
---
...
s:wait(.01)
@@ -123,7 +123,7 @@ s:close()
---
- true
...
-s = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+s = socket('PF_INET', 'SOCK_STREAM', 'tcp')
---
...
s:setsockopt('SOL_SOCKET', 'SO_REUSEADDR', true)
@@ -149,7 +149,7 @@ s:listen(128)
sevres = {}
---
...
-type(require('box.fiber').wrap(function() s:readable() do local sc = s:accept() table.insert(sevres, sc) sc:syswrite('ok') sc:close() end end))
+type(require('fiber').wrap(function() s:readable() do local sc = s:accept() table.insert(sevres, sc) sc:syswrite('ok') sc:close() end end))
---
- userdata
...
@@ -157,7 +157,7 @@ type(require('box.fiber').wrap(function() s:readable() do local sc = s:accept()
---
- 0
...
-sc = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+sc = socket('PF_INET', 'SOCK_STREAM', 'tcp')
---
...
sc:nonblock(false)
@@ -262,7 +262,7 @@ s:close()
---
- true
...
-s = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+s = socket('PF_INET', 'SOCK_STREAM', 'tcp')
---
...
s:setsockopt('SOL_SOCKET', 'SO_REUSEADDR', true)
@@ -277,7 +277,7 @@ s:listen(128)
---
- true
...
-sc = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+sc = socket('PF_INET', 'SOCK_STREAM', 'tcp')
---
...
sc:writable()
@@ -427,7 +427,7 @@ sc:close()
---
- true
...
-s = boxsocket('PF_UNIX', 'SOCK_STREAM', 'ip')
+s = socket('PF_UNIX', 'SOCK_STREAM', 'ip')
---
...
s:setsockopt('SOL_SOCKET', 'SO_REUSEADDR', true)
@@ -468,7 +468,7 @@ s:listen(1234)
---
- true
...
-sc = boxsocket('PF_UNIX', 'SOCK_STREAM', 'ip')
+sc = socket('PF_UNIX', 'SOCK_STREAM', 'ip')
---
...
sc:nonblock(true)
@@ -529,24 +529,24 @@ function aexitst(ai, host, port)
end;
---
...
-aexitst( boxsocket.getaddrinfo('localhost', 'http', { protocol = 'tcp',
+aexitst( socket.getaddrinfo('localhost', 'http', { protocol = 'tcp',
type = 'SOCK_STREAM'}), '127.0.0.1', 80 );
---
- true
...
--# setopt delimiter ''
-#(boxsocket.getaddrinfo('mail.ru', 'http', {})) > 0
+#(socket.getaddrinfo('mail.ru', 'http', {})) > 0
---
- true
...
-wrong_addr = boxsocket.getaddrinfo('mail12211alklkl.ru', 'http', {})
+wrong_addr = socket.getaddrinfo('mail12211alklkl.ru', 'http', {})
---
...
wrong_addr == nil or #wrong_addr == 0
---
- true
...
-sc = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+sc = socket('PF_INET', 'SOCK_STREAM', 'tcp')
---
...
sc ~= nil
@@ -581,24 +581,24 @@ string.match(tostring(sc), ', peer') == nil
---
- true
...
-require('box.errno').strerror(sc:getsockopt('SOL_SOCKET', 'SO_ERROR'))
+require('errno').strerror(sc:getsockopt('SOL_SOCKET', 'SO_ERROR'))
---
- Connection refused
...
--# setopt delimiter ';'
-json.encode(boxsocket.getaddrinfo('ya.ru', '80',
+json.encode(socket.getaddrinfo('ya.ru', '80',
{ flags = { 'AI_NUMERICSERV', 'AI_NUMERICHOST', } }))
---
- '{}'
...
--# setopt delimiter ''
-json.encode(boxsocket.getaddrinfo('ya.ru', '80',
+json.encode(socket.getaddrinfo('ya.ru', '80',
{ flags = { 'AI_NUMERICSERV', 'AI_NUMERICHOST', } }))
---
- '{}'
...
-sc = boxsocket('AF_INET', 'SOCK_STREAM', 'tcp')
+sc = socket('AF_INET', 'SOCK_STREAM', 'tcp')
---
...
json.encode(sc:name())
@@ -613,14 +613,14 @@ sc:close()
---
- true
...
-s = boxsocket('AF_INET', 'SOCK_DGRAM', 'udp')
+s = socket('AF_INET', 'SOCK_DGRAM', 'udp')
---
...
s:bind('127.0.0.1', 3548)
---
- true
...
-sc = boxsocket('AF_INET', 'SOCK_DGRAM', 'udp')
+sc = socket('AF_INET', 'SOCK_DGRAM', 'udp')
---
...
sc:sendto('127.0.0.1', 3548, 'Hello, world')
@@ -655,7 +655,7 @@ sc:close()
---
- true
...
-s = boxsocket('AF_INET', 'SOCK_DGRAM', 'udp')
+s = socket('AF_INET', 'SOCK_DGRAM', 'udp')
---
...
s:nonblock(true)
@@ -670,7 +670,7 @@ s:name().port > 0
---
- true
...
-sc = boxsocket('AF_INET', 'SOCK_DGRAM', 'udp')
+sc = socket('AF_INET', 'SOCK_DGRAM', 'udp')
---
...
sc:nonblock(true)
diff --git a/test/box/bsdsocket.test.lua b/test/box/bsdsocket.test.lua
index 80b5104361fd1cea35755a378cce8cd4dd9816d0..95af2305217585fadc2f54d7fb5083404b5f2753 100644
--- a/test/box/bsdsocket.test.lua
+++ b/test/box/bsdsocket.test.lua
@@ -1,10 +1,10 @@
-json = require('box.json')
-boxsocket = require('box.socket')
-type(boxsocket)
+json = require('json')
+socket = require('socket')
+type(socket)
-boxsocket('PF_INET', 'SOCK_STREAM', 'tcp121222');
+socket('PF_INET', 'SOCK_STREAM', 'tcp121222');
-s = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+s = socket('PF_INET', 'SOCK_STREAM', 'tcp')
s:wait(.01)
type(s)
s:errno()
@@ -37,17 +37,17 @@ s:readable(1)
string.len(s:sysread(4096))
s:close()
-s = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+s = socket('PF_INET', 'SOCK_STREAM', 'tcp')
s:setsockopt('SOL_SOCKET', 'SO_REUSEADDR', true)
s:error()
s:bind('127.0.0.1', 3457)
s:error()
s:listen(128)
sevres = {}
-type(require('box.fiber').wrap(function() s:readable() do local sc = s:accept() table.insert(sevres, sc) sc:syswrite('ok') sc:close() end end))
+type(require('fiber').wrap(function() s:readable() do local sc = s:accept() table.insert(sevres, sc) sc:syswrite('ok') sc:close() end end))
#sevres
-sc = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+sc = socket('PF_INET', 'SOCK_STREAM', 'tcp')
sc:nonblock(false)
sc:sysconnect('127.0.0.1', 3457)
sc:nonblock(true)
@@ -75,12 +75,12 @@ s:linger()
s:shutdown('R')
s:close()
-s = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+s = socket('PF_INET', 'SOCK_STREAM', 'tcp')
s:setsockopt('SOL_SOCKET', 'SO_REUSEADDR', true)
s:bind('127.0.0.1', 3457)
s:listen(128)
-sc = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+sc = socket('PF_INET', 'SOCK_STREAM', 'tcp')
sc:writable()
sc:readable()
@@ -125,7 +125,7 @@ sa:read(100, 1)
sa:close()
sc:close()
-s = boxsocket('PF_UNIX', 'SOCK_STREAM', 'ip')
+s = socket('PF_UNIX', 'SOCK_STREAM', 'ip')
s:setsockopt('SOL_SOCKET', 'SO_REUSEADDR', true)
s ~= nil
s:nonblock()
@@ -136,7 +136,7 @@ s:bind('unix/', '/tmp/tarantool-test-socket')
sc ~= nil
s:listen(1234)
-sc = boxsocket('PF_UNIX', 'SOCK_STREAM', 'ip')
+sc = socket('PF_UNIX', 'SOCK_STREAM', 'ip')
sc:nonblock(true)
sc:sysconnect('unix/', '/tmp/tarantool-test-socket')
sc:error()
@@ -163,15 +163,15 @@ function aexitst(ai, host, port)
return false
end;
-aexitst( boxsocket.getaddrinfo('localhost', 'http', { protocol = 'tcp',
+aexitst( socket.getaddrinfo('localhost', 'http', { protocol = 'tcp',
type = 'SOCK_STREAM'}), '127.0.0.1', 80 );
--# setopt delimiter ''
-#(boxsocket.getaddrinfo('mail.ru', 'http', {})) > 0
-wrong_addr = boxsocket.getaddrinfo('mail12211alklkl.ru', 'http', {})
+#(socket.getaddrinfo('mail.ru', 'http', {})) > 0
+wrong_addr = socket.getaddrinfo('mail12211alklkl.ru', 'http', {})
wrong_addr == nil or #wrong_addr == 0
-sc = boxsocket('PF_INET', 'SOCK_STREAM', 'tcp')
+sc = socket('PF_INET', 'SOCK_STREAM', 'tcp')
sc ~= nil
sc:getsockopt('SOL_SOCKET', 'SO_ERROR')
sc:nonblock(true)
@@ -180,21 +180,21 @@ sc:sysconnect('127.0.0.1', 3458)
string.match(tostring(sc), ', peer') == nil
sc:writable()
string.match(tostring(sc), ', peer') == nil
-require('box.errno').strerror(sc:getsockopt('SOL_SOCKET', 'SO_ERROR'))
+require('errno').strerror(sc:getsockopt('SOL_SOCKET', 'SO_ERROR'))
--# setopt delimiter ';'
-json.encode(boxsocket.getaddrinfo('ya.ru', '80',
+json.encode(socket.getaddrinfo('ya.ru', '80',
{ flags = { 'AI_NUMERICSERV', 'AI_NUMERICHOST', } }))
--# setopt delimiter ''
-sc = boxsocket('AF_INET', 'SOCK_STREAM', 'tcp')
+sc = socket('AF_INET', 'SOCK_STREAM', 'tcp')
json.encode(sc:name())
sc:nonblock(true)
sc:close()
-s = boxsocket('AF_INET', 'SOCK_DGRAM', 'udp')
+s = socket('AF_INET', 'SOCK_DGRAM', 'udp')
s:bind('127.0.0.1', 3548)
-sc = boxsocket('AF_INET', 'SOCK_DGRAM', 'udp')
+sc = socket('AF_INET', 'SOCK_DGRAM', 'udp')
sc:sendto('127.0.0.1', 3548, 'Hello, world')
s:readable(10)
s:recv(4096)
@@ -205,11 +205,11 @@ local d, from = s:recvfrom(4096) print(' - ', from.port > 0) from.port = 'Random
s:close()
sc:close()
-s = boxsocket('AF_INET', 'SOCK_DGRAM', 'udp')
+s = socket('AF_INET', 'SOCK_DGRAM', 'udp')
s:nonblock(true)
s:bind('127.0.0.1')
s:name().port > 0
-sc = boxsocket('AF_INET', 'SOCK_DGRAM', 'udp')
+sc = socket('AF_INET', 'SOCK_DGRAM', 'udp')
sc:nonblock(true)
sc:sendto('127.0.0.1', s:name().port)
sc:sendto('127.0.0.1', s:name().port, 'Hello, World!')
diff --git a/test/box/cjson.result b/test/box/cjson.result
index 376819eb24ba149b9ca37150211947c2e7b71b03..e7fe97873b753be790c374a5e1ed8091ccf41eca 100644
--- a/test/box/cjson.result
+++ b/test/box/cjson.result
@@ -1,5 +1,5 @@
-- cjson tests
-json = require('box.json')
+json = require('json')
---
...
type(json)
diff --git a/test/box/cjson.test.lua b/test/box/cjson.test.lua
index eeb8dddb7e7e113fcd724867fd745b35d6d282a1..20970e8259299e8b86ca67932848aeaa24736e6f 100644
--- a/test/box/cjson.test.lua
+++ b/test/box/cjson.test.lua
@@ -1,5 +1,5 @@
-- cjson tests
-json = require('box.json')
+json = require('json')
type(json)
json.encode(123)
diff --git a/test/box/digest.result b/test/box/digest.result
index ffdae2d188fd6da0ec6a66d9314f5a82aeb2fb62..4ee42a1f2098208c350c09789214312c3d4a3e99 100644
--- a/test/box/digest.result
+++ b/test/box/digest.result
@@ -1,151 +1,154 @@
-boxdigest = require('box.digest')
+digest = require('digest')
---
...
-type(boxdigest)
+type(digest)
---
- table
...
-boxdigest.md4_hex()
+digest.md4_hex()
---
- 31d6cfe0d16ae931b73c59d7e0c089c0
...
-boxdigest.md5_hex()
+digest.md5_hex()
---
- d41d8cd98f00b204e9800998ecf8427e
...
-boxdigest.sha_hex()
+digest.sha_hex()
---
- f96cea198ad1dd5617ac084a3d92c6107708c0ef
...
-boxdigest.sha1_hex()
+digest.sha1_hex()
---
- da39a3ee5e6b4b0d3255bfef95601890afd80709
...
-boxdigest.sha224_hex()
+digest.sha224_hex()
---
- d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f
...
-boxdigest.sha256_hex()
+digest.sha256_hex()
---
- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
...
-boxdigest.sha384_hex()
+digest.sha384_hex()
---
- 38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b
...
-boxdigest.sha512_hex()
+digest.sha512_hex()
---
- cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
...
-string.len(boxdigest.md4_hex())
+string.len(digest.md4_hex())
---
- 32
...
-string.len(boxdigest.md5_hex())
+string.len(digest.md5_hex())
---
- 32
...
-string.len(boxdigest.sha_hex())
+string.len(digest.sha_hex())
---
- 40
...
-string.len(boxdigest.sha1_hex())
+string.len(digest.sha1_hex())
---
- 40
...
-string.len(boxdigest.sha224_hex())
+string.len(digest.sha224_hex())
---
- 56
...
-string.len(boxdigest.sha256_hex())
+string.len(digest.sha256_hex())
---
- 64
...
-string.len(boxdigest.sha384_hex())
+string.len(digest.sha384_hex())
---
- 96
...
-string.len(boxdigest.sha512_hex())
+string.len(digest.sha512_hex())
---
- 128
...
-string.len(boxdigest.md4())
+string.len(digest.md4())
---
- 16
...
-string.len(boxdigest.md5())
+string.len(digest.md5())
---
- 16
...
-string.len(boxdigest.sha())
+string.len(digest.sha())
---
- 20
...
-string.len(boxdigest.sha1())
+string.len(digest.sha1())
---
- 20
...
-string.len(boxdigest.sha224())
+string.len(digest.sha224())
---
- 28
...
-string.len(boxdigest.sha256())
+string.len(digest.sha256())
---
- 32
...
-string.len(boxdigest.sha384())
+string.len(digest.sha384())
---
- 48
...
-string.len(boxdigest.sha512())
+string.len(digest.sha512())
---
- 64
...
-boxdigest.md5_hex(123)
+digest.md5_hex(123)
---
- 202cb962ac59075b964b07152d234b70
...
-boxdigest.md5_hex('123')
+digest.md5_hex('123')
---
- 202cb962ac59075b964b07152d234b70
...
-boxdigest.md5_hex(true)
+digest.md5_hex(true)
---
- b326b5062b2f0e69046810717534cb09
...
-boxdigest.md5_hex('true')
+digest.md5_hex('true')
---
- b326b5062b2f0e69046810717534cb09
...
-boxdigest.md5_hex(nil)
+digest.md5_hex(nil)
---
- d41d8cd98f00b204e9800998ecf8427e
...
-boxdigest.md5_hex()
+digest.md5_hex()
---
- d41d8cd98f00b204e9800998ecf8427e
...
-boxdigest.crc32()
+digest.crc32()
---
- 4294967295
...
-boxdigest.crc32_update(4294967295, '')
+digest.crc32_update(4294967295, '')
---
- 4294967295
...
-boxdigest.crc32('abc')
+digest.crc32('abc')
---
- 3384066120
...
-boxdigest.crc32_update(4294967295, 'abc')
+digest.crc32_update(4294967295, 'abc')
---
- 3384066120
...
-boxdigest.crc32('abccde')
+digest.crc32('abccde')
---
- 3628146660
...
-boxdigest.crc32_update(boxdigest.crc32('abc'), 'cde')
+digest.crc32_update(digest.crc32('abc'), 'cde')
---
- 3628146660
...
+digest = nil
+---
+...
diff --git a/test/box/digest.test.lua b/test/box/digest.test.lua
index de5720b8ac16559ab1afa218d932822cd9019f2b..96f3b5c6d2aa1fb014a79a2e900d50bb1cbb05f4 100644
--- a/test/box/digest.test.lua
+++ b/test/box/digest.test.lua
@@ -1,45 +1,46 @@
-boxdigest = require('box.digest')
-type(boxdigest)
+digest = require('digest')
+type(digest)
-boxdigest.md4_hex()
-boxdigest.md5_hex()
-boxdigest.sha_hex()
-boxdigest.sha1_hex()
-boxdigest.sha224_hex()
-boxdigest.sha256_hex()
-boxdigest.sha384_hex()
-boxdigest.sha512_hex()
+digest.md4_hex()
+digest.md5_hex()
+digest.sha_hex()
+digest.sha1_hex()
+digest.sha224_hex()
+digest.sha256_hex()
+digest.sha384_hex()
+digest.sha512_hex()
-string.len(boxdigest.md4_hex())
-string.len(boxdigest.md5_hex())
-string.len(boxdigest.sha_hex())
-string.len(boxdigest.sha1_hex())
-string.len(boxdigest.sha224_hex())
-string.len(boxdigest.sha256_hex())
-string.len(boxdigest.sha384_hex())
-string.len(boxdigest.sha512_hex())
+string.len(digest.md4_hex())
+string.len(digest.md5_hex())
+string.len(digest.sha_hex())
+string.len(digest.sha1_hex())
+string.len(digest.sha224_hex())
+string.len(digest.sha256_hex())
+string.len(digest.sha384_hex())
+string.len(digest.sha512_hex())
-string.len(boxdigest.md4())
-string.len(boxdigest.md5())
-string.len(boxdigest.sha())
-string.len(boxdigest.sha1())
-string.len(boxdigest.sha224())
-string.len(boxdigest.sha256())
-string.len(boxdigest.sha384())
-string.len(boxdigest.sha512())
+string.len(digest.md4())
+string.len(digest.md5())
+string.len(digest.sha())
+string.len(digest.sha1())
+string.len(digest.sha224())
+string.len(digest.sha256())
+string.len(digest.sha384())
+string.len(digest.sha512())
-boxdigest.md5_hex(123)
-boxdigest.md5_hex('123')
-boxdigest.md5_hex(true)
-boxdigest.md5_hex('true')
-boxdigest.md5_hex(nil)
-boxdigest.md5_hex()
+digest.md5_hex(123)
+digest.md5_hex('123')
+digest.md5_hex(true)
+digest.md5_hex('true')
+digest.md5_hex(nil)
+digest.md5_hex()
-boxdigest.crc32()
-boxdigest.crc32_update(4294967295, '')
+digest.crc32()
+digest.crc32_update(4294967295, '')
-boxdigest.crc32('abc')
-boxdigest.crc32_update(4294967295, 'abc')
+digest.crc32('abc')
+digest.crc32_update(4294967295, 'abc')
-boxdigest.crc32('abccde')
-boxdigest.crc32_update(boxdigest.crc32('abc'), 'cde')
+digest.crc32('abccde')
+digest.crc32_update(digest.crc32('abc'), 'cde')
+digest = nil
diff --git a/test/box/errinj.result b/test/box/errinj.result
index 4a6af65688d39034fddd1c68af7375b2364ab3d3..e0456e8f33fbb8e183bb74ea70bc510fae2a596d 100644
--- a/test/box/errinj.result
+++ b/test/box/errinj.result
@@ -1,10 +1,13 @@
+errinj = require('errinj')
+---
+...
space = box.schema.create_space('tweedledum')
---
...
space:create_index('primary', { type = 'hash' })
---
...
-box.errinj.info()
+errinj.info()
---
- ERRINJ_WAL_IO:
state: false
@@ -17,18 +20,18 @@ box.errinj.info()
ERRINJ_TREE_ALLOC:
state: false
...
-box.errinj.set("some-injection", true)
+errinj.set("some-injection", true)
---
- 'error: can''t find error injection ''some-injection'''
...
-box.errinj.set("some-injection") -- check error
+errinj.set("some-injection") -- check error
---
- 'error: can''t find error injection ''some-injection'''
...
space:get{222444}
---
...
-box.errinj.set("ERRINJ_TESTING", true)
+errinj.set("ERRINJ_TESTING", true)
---
- ok
...
@@ -36,12 +39,12 @@ space:get{222444}
---
- error: Error injection 'ERRINJ_TESTING'
...
-box.errinj.set("ERRINJ_TESTING", false)
+errinj.set("ERRINJ_TESTING", false)
---
- ok
...
-- Check how well we handle a failed log write
-box.errinj.set("ERRINJ_WAL_IO", true)
+errinj.set("ERRINJ_WAL_IO", true)
---
- ok
...
@@ -52,7 +55,7 @@ space:insert{1}
space:get{1}
---
...
-box.errinj.set("ERRINJ_WAL_IO", false)
+errinj.set("ERRINJ_WAL_IO", false)
---
- ok
...
@@ -60,7 +63,7 @@ space:insert{1}
---
- [1]
...
-box.errinj.set("ERRINJ_WAL_IO", true)
+errinj.set("ERRINJ_WAL_IO", true)
---
- ok
...
@@ -75,7 +78,7 @@ space:get{1}
space:get{2}
---
...
-box.errinj.set("ERRINJ_WAL_IO", false)
+errinj.set("ERRINJ_WAL_IO", false)
---
- ok
...
@@ -83,7 +86,7 @@ space:truncate()
---
...
-- Check a failed log rotation
-box.errinj.set("ERRINJ_WAL_ROTATE", true)
+errinj.set("ERRINJ_WAL_ROTATE", true)
---
- ok
...
@@ -94,7 +97,7 @@ space:insert{1}
space:get{1}
---
...
-box.errinj.set("ERRINJ_WAL_ROTATE", false)
+errinj.set("ERRINJ_WAL_ROTATE", false)
---
- ok
...
@@ -102,7 +105,7 @@ space:insert{1}
---
- [1]
...
-box.errinj.set("ERRINJ_WAL_ROTATE", true)
+errinj.set("ERRINJ_WAL_ROTATE", true)
---
- ok
...
@@ -117,7 +120,7 @@ space:get{1}
space:get{2}
---
...
-box.errinj.set("ERRINJ_WAL_ROTATE", false)
+errinj.set("ERRINJ_WAL_ROTATE", false)
---
- ok
...
@@ -132,7 +135,7 @@ space:get{2}
---
- [2]
...
-box.errinj.set("ERRINJ_WAL_ROTATE", true)
+errinj.set("ERRINJ_WAL_ROTATE", true)
---
- ok
...
@@ -140,7 +143,7 @@ space:truncate()
---
- error: Failed to write to disk
...
-box.errinj.set("ERRINJ_WAL_ROTATE", false)
+errinj.set("ERRINJ_WAL_ROTATE", false)
---
- ok
...
@@ -177,7 +180,7 @@ s_withdata:insert{4, 5, 6, 7, 8}
s_withdata:create_index('secondary', { type = 'hash', parts = {1, 'num', 2, 'num' }})
---
...
-box.errinj.set("ERRINJ_WAL_IO", true)
+errinj.set("ERRINJ_WAL_IO", true)
---
- ok
...
@@ -229,7 +232,7 @@ s_withdata.index.another
---
- null
...
-box.errinj.set("ERRINJ_WAL_IO", false)
+errinj.set("ERRINJ_WAL_IO", false)
---
- ok
...
@@ -285,3 +288,6 @@ s_disabled:drop()
s_withindex:drop()
---
...
+errinj = nil
+---
+...
diff --git a/test/box/errinj.test.lua b/test/box/errinj.test.lua
index d3ba84ff8b9d185fb0c1515a23f66ffa6c3051e3..98caa6ab9cbff2803eb491eabadea5cf5e398014 100644
--- a/test/box/errinj.test.lua
+++ b/test/box/errinj.test.lua
@@ -1,44 +1,46 @@
+errinj = require('errinj')
+
space = box.schema.create_space('tweedledum')
space:create_index('primary', { type = 'hash' })
-box.errinj.info()
-box.errinj.set("some-injection", true)
-box.errinj.set("some-injection") -- check error
+errinj.info()
+errinj.set("some-injection", true)
+errinj.set("some-injection") -- check error
space:get{222444}
-box.errinj.set("ERRINJ_TESTING", true)
+errinj.set("ERRINJ_TESTING", true)
space:get{222444}
-box.errinj.set("ERRINJ_TESTING", false)
+errinj.set("ERRINJ_TESTING", false)
-- Check how well we handle a failed log write
-box.errinj.set("ERRINJ_WAL_IO", true)
+errinj.set("ERRINJ_WAL_IO", true)
space:insert{1}
space:get{1}
-box.errinj.set("ERRINJ_WAL_IO", false)
+errinj.set("ERRINJ_WAL_IO", false)
space:insert{1}
-box.errinj.set("ERRINJ_WAL_IO", true)
+errinj.set("ERRINJ_WAL_IO", true)
space:update(1, {{'=', 0, 2}})
space:get{1}
space:get{2}
-box.errinj.set("ERRINJ_WAL_IO", false)
+errinj.set("ERRINJ_WAL_IO", false)
space:truncate()
-- Check a failed log rotation
-box.errinj.set("ERRINJ_WAL_ROTATE", true)
+errinj.set("ERRINJ_WAL_ROTATE", true)
space:insert{1}
space:get{1}
-box.errinj.set("ERRINJ_WAL_ROTATE", false)
+errinj.set("ERRINJ_WAL_ROTATE", false)
space:insert{1}
-box.errinj.set("ERRINJ_WAL_ROTATE", true)
+errinj.set("ERRINJ_WAL_ROTATE", true)
space:update(1, {{'=', 0, 2}})
space:get{1}
space:get{2}
-box.errinj.set("ERRINJ_WAL_ROTATE", false)
+errinj.set("ERRINJ_WAL_ROTATE", false)
space:update(1, {{'=', 0, 2}})
space:get{1}
space:get{2}
-box.errinj.set("ERRINJ_WAL_ROTATE", true)
+errinj.set("ERRINJ_WAL_ROTATE", true)
space:truncate()
-box.errinj.set("ERRINJ_WAL_ROTATE", false)
+errinj.set("ERRINJ_WAL_ROTATE", false)
space:truncate()
space:drop()
@@ -52,7 +54,7 @@ s_withdata:create_index('primary', { type = 'tree' })
s_withdata:insert{1, 2, 3, 4, 5}
s_withdata:insert{4, 5, 6, 7, 8}
s_withdata:create_index('secondary', { type = 'hash', parts = {1, 'num', 2, 'num' }})
-box.errinj.set("ERRINJ_WAL_IO", true)
+errinj.set("ERRINJ_WAL_IO", true)
test = box.schema.create_space('test')
s_disabled:create_index('primary', { type = 'hash' })
s_disabled.enabled
@@ -65,7 +67,7 @@ s_withdata:drop()
box.space['withdata'].enabled
s_withdata:create_index('another', { type = 'tree', parts = { 4, 'num' }, unique = false})
s_withdata.index.another
-box.errinj.set("ERRINJ_WAL_IO", false)
+errinj.set("ERRINJ_WAL_IO", false)
test = box.schema.create_space('test')
s_disabled:create_index('primary', { type = 'hash' })
s_disabled.enabled
@@ -81,3 +83,5 @@ s_withdata.index.another
test:drop()
s_disabled:drop()
s_withindex:drop()
+
+errinj = nil
diff --git a/test/box/errinj_index.result b/test/box/errinj_index.result
index cdf852d27c003d4537f46f7e1803e396572b2604..6233799f527c6b18291b71f28d61883228983494 100644
--- a/test/box/errinj_index.result
+++ b/test/box/errinj_index.result
@@ -1,3 +1,6 @@
+errinj = require('errinj')
+---
+...
s = box.schema.create_space('tweedledum')
---
...
@@ -46,7 +49,7 @@ res
- [9, 9, 'test9']
- [10, 10, 'test10']
...
-box.errinj.set("ERRINJ_TREE_ALLOC", true)
+errinj.set("ERRINJ_TREE_ALLOC", true)
---
- ok
...
@@ -192,7 +195,7 @@ check_iter_and_size()
---
- ok
...
-box.errinj.set("ERRINJ_TREE_ALLOC", false)
+errinj.set("ERRINJ_TREE_ALLOC", false)
---
- ok
...
@@ -256,3 +259,6 @@ res
s:drop()
---
...
+errinj = nil
+---
+...
diff --git a/test/box/errinj_index.test.lua b/test/box/errinj_index.test.lua
index cd543a6143d830782fedba5076b3f2bf583eaf81..cd4155ec151d79dcbdabb1d5641866eaa5da69f4 100644
--- a/test/box/errinj_index.test.lua
+++ b/test/box/errinj_index.test.lua
@@ -1,3 +1,5 @@
+errinj = require('errinj')
+
s = box.schema.create_space('tweedledum')
s:create_index('primary')
@@ -11,7 +13,7 @@ res = {}
for _, t in s.index[0]:pairs() do table.insert(res, t) end
res
-box.errinj.set("ERRINJ_TREE_ALLOC", true)
+errinj.set("ERRINJ_TREE_ALLOC", true)
res = {}
for i = 1,10 do table.insert(res, s:get{i}) end
@@ -48,7 +50,7 @@ for i = 3501,4500 do s:insert{i, i} end
s:delete{3}
check_iter_and_size()
-box.errinj.set("ERRINJ_TREE_ALLOC", false)
+errinj.set("ERRINJ_TREE_ALLOC", false)
for i = 4501,5500 do s:insert{i, i} end
res = {}
@@ -63,3 +65,4 @@ for i = 5001,5010 do table.insert(res, (s:get{i})) end
res
s:drop()
+errinj = nil
diff --git a/test/box/errno.result b/test/box/errno.result
index 5c95a4541fbf081528ea949977a6b8e143c50bb5..d869d2797bb7784e284805da8b3f0caa76f2e471 100644
--- a/test/box/errno.result
+++ b/test/box/errno.result
@@ -1,4 +1,4 @@
-errno = require('box.errno')
+errno = require('errno')
---
...
type(errno)
@@ -27,3 +27,6 @@ errno.strerror(errno.EINVAL)
---
- Invalid argument
...
+errno = nil
+---
+...
diff --git a/test/box/errno.test.lua b/test/box/errno.test.lua
index fcb650ab6a8995281058cfedf1f2aa343accf598..fd01789af9c955b7baa4b7fda89d99a9aa86b3f2 100644
--- a/test/box/errno.test.lua
+++ b/test/box/errno.test.lua
@@ -1,7 +1,8 @@
-errno = require('box.errno')
+errno = require('errno')
type(errno)
errno.EINVAL > 0
errno.EBADF > 0
errno(errno.EINVAL) == errno.EINVAL, errno() == errno.EINVAL
errno(errno.EBADF) ~= errno.EINVAL, errno() == errno.EBADF
errno.strerror(errno.EINVAL)
+errno = nil
diff --git a/test/box/fiber.result b/test/box/fiber.result
index 63ba7338c4ac3952967042c9baed7ad22f157674..fa4ab8e60ff2347455204a5683a5c2c9e527cfbb 100644
--- a/test/box/fiber.result
+++ b/test/box/fiber.result
@@ -1,4 +1,4 @@
-box.fiber = require('box.fiber')
+fiber = require('fiber')
---
...
space = box.schema.create_space('tweedledum')
@@ -215,36 +215,36 @@ space:truncate()
-- test passing arguments in and out created fiber
--# setopt delimiter ';'
function y()
- box.fiber.detach('started')
+ fiber.detach('started')
space = box.space['tweedledum']
while true do
space:replace{1953719668, os.time()}
- box.fiber.sleep(0.001)
+ fiber.sleep(0.001)
end
end;
---
...
-f = box.fiber.create(y);
+f = fiber.create(y);
---
...
-box.fiber.resume(f);
+fiber.resume(f);
---
- started
...
-box.fiber.sleep(0.002);
+fiber.sleep(0.002);
---
...
-box.fiber.cancel(f);
+fiber.cancel(f);
---
...
-box.fiber.resume(f);
+fiber.resume(f);
---
- error: 'fiber.resume(): the fiber is dead'
...
for k = 1, 1000, 1 do
- box.fiber.create(
+ fiber.create(
function()
- box.fiber.detach()
+ fiber.detach()
end
)
end;
@@ -256,32 +256,32 @@ collectgarbage('collect')
- 0
...
-- check that these newly created fibers are garbage collected
-box.fiber.find(900)
+fiber.find(900)
---
- null
...
-box.fiber.find(910)
+fiber.find(910)
---
- null
...
-box.fiber.find(920)
+fiber.find(920)
---
- null
...
-box.fiber.find()
+fiber.find()
---
- error: 'fiber.find(id): bad arguments'
...
-box.fiber.find('test')
+fiber.find('test')
---
- null
...
-- https://github.com/tarantool/tarantool/issues/131
--- box.fiber.resume(box.fiber.cancel()) -- hang
-f = box.fiber.create(function() box.fiber.cancel(box.fiber.self()) end)
+-- fiber.resume(fiber.cancel()) -- hang
+f = fiber.create(function() fiber.cancel(fiber.self()) end)
---
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- error: 'fiber.resume(): the child fiber got cancelled'
...
@@ -289,19 +289,19 @@ f = nil
---
...
-- https://github.com/tarantool/tarantool/issues/119
-ftest = function() box.fiber.sleep(0.01 * math.random() ) return true end
+ftest = function() fiber.sleep(0.01 * math.random() ) return true end
---
...
--# setopt delimiter ';'
for i = 1, 10 do
result = {}
for j = 1, 300 do
- box.fiber.resume(box.fiber.create(function()
- box.fiber.detach()
+ fiber.resume(fiber.create(function()
+ fiber.detach()
table.insert(result, ftest())
end))
end
- while #result < 300 do box.fiber.sleep(0.01) end
+ while #result < 300 do fiber.sleep(0.01) end
end;
---
...
@@ -313,12 +313,12 @@ end;
--# setopt delimiter ''
--
--
--- Test box.fiber.wrap()
+-- Test fiber.wrap()
--
-- This should try to infinitely create fibers,
-- but hit the fiber stack size limit and fail
-- with an error.
-f = function() box.fiber.wrap(f) end
+f = function() fiber.wrap(f) end
---
...
f()
@@ -327,7 +327,7 @@ f()
--
-- Test argument passing
--
-f = function(a, b) box.fiber.wrap(function(arg) result = arg end, a..b) end
+f = function(a, b) fiber.wrap(function(arg) result = arg end, a..b) end
---
...
f('hello ', 'world')
@@ -347,7 +347,7 @@ result
--
-- Test that the created fiber is detached
--
-box.fiber.wrap(function() result = box.fiber.status() end)
+fiber.wrap(function() result = fiber.status() end)
---
- null
...
@@ -358,7 +358,7 @@ result
-- A test case for Bug#933487
-- tarantool crashed during shutdown if non running LUA fiber
-- was created
-f = box.fiber.create(function () return true end)
+f = fiber.create(function () return true end)
---
...
box.snapshot()
@@ -373,77 +373,77 @@ box.snapshot()
---
- error: can't save snapshot, errno 17 (File exists)
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- true
- true
...
-f = box.fiber.create(function () return true end)
+f = fiber.create(function () return true end)
---
...
-box.fiber.sleep(0)
+fiber.sleep(0)
---
...
-box.fiber.sleep(0.01)
+fiber.sleep(0.01)
---
...
-box.fiber.sleep(0.0001)
+fiber.sleep(0.0001)
---
...
-box.fiber.sleep('hello')
+fiber.sleep('hello')
---
- error: 'fiber.sleep(delay): bad arguments'
...
-box.fiber.sleep(box, 0.001)
+fiber.sleep(box, 0.001)
---
- error: 'fiber.sleep(delay): bad arguments'
...
-box.fiber.cancel(box.fiber.self())
+fiber.cancel(fiber.self())
---
- error: 'fiber.cancel(): subject fiber does not permit cancel'
...
-f = box.fiber.self()
+f = fiber.self()
---
...
old_id = f:id()
---
...
-box.fiber.cancel(f)
+fiber.cancel(f)
---
- error: 'fiber.cancel(): subject fiber does not permit cancel'
...
-box.fiber.self():id() - old_id < 3
+fiber.self():id() - old_id < 3
---
- true
...
-box.fiber.cancel(box.fiber.self())
+fiber.cancel(fiber.self())
---
- error: 'fiber.cancel(): subject fiber does not permit cancel'
...
-box.fiber.self():id() - old_id < 5
+fiber.self():id() - old_id < 5
---
- true
...
-g = box.fiber.self()
+g = fiber.self()
---
...
f==g
---
- true
...
-function r() f = box.fiber.create(r) return (box.fiber.resume(f)) end
+function r() f = fiber.create(r) return (fiber.resume(f)) end
---
...
r()
---
- true
...
-f = box.fiber.create(print('hello')
+f = fiber.create(print('hello'))
---
-- error: '[string "f = box.fiber.create(print(''hello'') "]:1: '')'' expected near
- ''<eof>'''
+- error: '[string "f = fiber.create(print(''hello'')) "]:1: fiber.create(function):
+ bad arguments'
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- error: 'fiber.resume(): the fiber is dead'
...
@@ -451,85 +451,85 @@ box.fiber.resume(f)
function r(a, b) return a, b end
---
...
-f=box.fiber.create(r)
+f=fiber.create(r)
---
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- true
- null
- null
...
-f=box.fiber.create(r)
+f=fiber.create(r)
---
...
-box.fiber.resume(f, 'hello')
+fiber.resume(f, 'hello')
---
- true
- hello
- null
...
-f=box.fiber.create(r)
+f=fiber.create(r)
---
...
-box.fiber.resume(f, 'hello', 'world')
+fiber.resume(f, 'hello', 'world')
---
- true
- hello
- world
...
-f=box.fiber.create(r)
+f=fiber.create(r)
---
...
-box.fiber.resume(f, 'hello', 'world', 'wide')
+fiber.resume(f, 'hello', 'world', 'wide')
---
- true
- hello
- world
...
-function y(a, b) c=box.fiber.yield(a) return box.fiber.yield(b, c) end
+function y(a, b) c=fiber.yield(a) return fiber.yield(b, c) end
---
...
-f=box.fiber.create(y)
+f=fiber.create(y)
---
...
-box.fiber.resume(f, 'hello', 'world')
+fiber.resume(f, 'hello', 'world')
---
- hello
...
-box.fiber.resume(f, 'wide')
+fiber.resume(f, 'wide')
---
- world
- wide
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- true
...
-function y() box.fiber.detach() while true do box.replace(0, 1953719668, os.time()) box.fiber.sleep(0.001) end end
+function y() fiber.detach() while true do box.replace(0, 1953719668, os.time()) fiber.sleep(0.001) end end
---
...
-f = box.fiber.create(y)
+f = fiber.create(y)
---
...
-box.fiber.resume(f)
+fiber.resume(f)
---
...
-box.fiber.sleep(0.002)
+fiber.sleep(0.002)
---
...
-box.fiber.cancel(f)
+fiber.cancel(f)
---
- error: 'fiber.resume(): the fiber is dead'
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- error: 'fiber.resume(): the fiber is dead'
...
f=nil
---
...
-for k=1, 10000, 1 do box.fiber.create(function() box.fiber.detach() end) end
+for k=1, 10000, 1 do fiber.create(function() fiber.detach() end) end
---
...
collectgarbage('collect')
@@ -537,249 +537,249 @@ collectgarbage('collect')
- 0
...
-- check that these newly created fibers are garbage collected
-box.fiber.find(9000)
+fiber.find(9000)
---
- null
...
-box.fiber.find(9010)
+fiber.find(9010)
---
- null
...
-box.fiber.find(9020)
+fiber.find(9020)
---
- null
...
--- test box.fiber.status functions: invalid arguments
-box.fiber.status(1)
+-- test fiber.status functions: invalid arguments
+fiber.status(1)
---
-- error: 'bad argument #1 to ''?'' (box.fiber expected, got number)'
+- error: 'bad argument #1 to ''?'' (fiber expected, got number)'
...
-box.fiber.status('fafa-gaga')
+fiber.status('fafa-gaga')
---
-- error: 'bad argument #1 to ''?'' (box.fiber expected, got string)'
+- error: 'bad argument #1 to ''?'' (fiber expected, got string)'
...
-box.fiber.status(nil)
+fiber.status(nil)
---
-- error: 'bad argument #1 to ''?'' (box.fiber expected, got nil)'
+- error: 'bad argument #1 to ''?'' (fiber expected, got nil)'
...
--- A test case for Bug#911641 box.fiber.sleep() works incorrectly if
+-- A test case for Bug#911641 fiber.sleep() works incorrectly if
-- a fiber is attached.
-function r() return box.fiber.sleep(0.01) end
+function r() return fiber.sleep(0.01) end
---
...
-f = box.fiber.create(r)
+f = fiber.create(r)
---
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- true
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- error: 'fiber.resume(): the fiber is dead'
...
--# setopt delimiter ';'
function r()
- box.fiber.yield(box.space.tweedledum:insert{0, 0, 1})
- box.fiber.yield(box.space.tweedledum:get{0})
- box.fiber.yield(box.space.tweedledum:truncate())
+ fiber.yield(box.space.tweedledum:insert{0, 0, 1})
+ fiber.yield(box.space.tweedledum:get{0})
+ fiber.yield(box.space.tweedledum:truncate())
end;
---
...
--# setopt delimiter ''
-f = box.fiber.create(r)
+f = fiber.create(r)
---
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- [0, 0, 1]
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- [0, 0, 1]
...
-box.fiber.resume(f)
+fiber.resume(f)
---
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- true
...
-function r() return box.fiber.yield(box.fiber.create(r)) end
+function r() return fiber.yield(fiber.create(r)) end
---
...
f = r()
---
...
-f1 = box.fiber.resume(f)
+f1 = fiber.resume(f)
---
...
-f2 = box.fiber.resume(f1)
+f2 = fiber.resume(f1)
---
...
-f3 = box.fiber.resume(f2)
+f3 = fiber.resume(f2)
---
...
-f4 = box.fiber.resume(f3)
+f4 = fiber.resume(f3)
---
...
-f5 = box.fiber.resume(f4)
+f5 = fiber.resume(f4)
---
...
-f6 = box.fiber.resume(f5)
+f6 = fiber.resume(f5)
---
...
-f7 = box.fiber.resume(f6)
+f7 = fiber.resume(f6)
---
...
-f8 = box.fiber.resume(f7)
+f8 = fiber.resume(f7)
---
...
-f9 = box.fiber.resume(f8)
+f9 = fiber.resume(f8)
---
...
-f10 = box.fiber.resume(f9)
+f10 = fiber.resume(f9)
---
...
-f11 = box.fiber.resume(f10)
+f11 = fiber.resume(f10)
---
...
-f12 = box.fiber.resume(f11)
+f12 = fiber.resume(f11)
---
...
-f13 = box.fiber.resume(f12)
+f13 = fiber.resume(f12)
---
...
-f14 = box.fiber.resume(f13)
+f14 = fiber.resume(f13)
---
...
-f15 = box.fiber.resume(f14)
+f15 = fiber.resume(f14)
---
...
-f16 = box.fiber.resume(f15)
+f16 = fiber.resume(f15)
---
...
-f17 = box.fiber.resume(f16)
+f17 = fiber.resume(f16)
---
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- true
...
-box.fiber.resume(f1)
+fiber.resume(f1)
---
- true
...
-box.fiber.resume(f2)
+fiber.resume(f2)
---
- true
...
-box.fiber.resume(f3)
+fiber.resume(f3)
---
- true
...
-box.fiber.resume(f4)
+fiber.resume(f4)
---
- true
...
-box.fiber.resume(f5)
+fiber.resume(f5)
---
- true
...
-box.fiber.resume(f6)
+fiber.resume(f6)
---
- true
...
-box.fiber.resume(f7)
+fiber.resume(f7)
---
- true
...
-box.fiber.resume(f8)
+fiber.resume(f8)
---
- true
...
-box.fiber.resume(f9)
+fiber.resume(f9)
---
- true
...
-box.fiber.resume(f10)
+fiber.resume(f10)
---
- true
...
-box.fiber.resume(f11)
+fiber.resume(f11)
---
- true
...
-box.fiber.resume(f12)
+fiber.resume(f12)
---
- true
...
-box.fiber.resume(f13)
+fiber.resume(f13)
---
- true
...
-box.fiber.resume(f14)
+fiber.resume(f14)
---
- true
...
-box.fiber.resume(f15)
+fiber.resume(f15)
---
- true
...
-box.fiber.resume(f16)
+fiber.resume(f16)
---
- true
...
f17 = nil
---
...
-function r() box.fiber.detach() box.fiber.sleep(1000) end
+function r() fiber.detach() fiber.sleep(1000) end
---
...
-f = box.fiber.create(r)
+f = fiber.create(r)
---
...
-box.fiber.resume(f)
+fiber.resume(f)
---
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- error: 'fiber.resume(): can''t resume a detached fiber'
...
-box.fiber.cancel(f)
+fiber.cancel(f)
---
...
-box.fiber.resume(f)
+fiber.resume(f)
---
- error: 'fiber.resume(): the fiber is dead'
...
--- Test box.fiber.name()
-old_name = box.fiber.name()
+-- Test fiber.name()
+old_name = fiber.name()
---
...
-box.fiber.name() == old_name
+fiber.name() == old_name
---
- true
...
-box.fiber.self():name() == old_name
+fiber.self():name() == old_name
---
- true
...
-box.fiber.name('hello fiber')
+fiber.name('hello fiber')
---
...
-box.fiber.name()
+fiber.name()
---
- hello fiber
...
-box.fiber.self():name('bye fiber')
+fiber.self():name('bye fiber')
---
...
-box.fiber.self():name()
+fiber.self():name()
---
- bye fiber
...
-box.fiber.self():name(old_name)
+fiber.self():name(old_name)
---
...
space:drop()
@@ -816,10 +816,10 @@ box_fiber_run_test()
- 'B: odd 5'
- 'status: dead'
...
-function testfun() while true do box.fiber.sleep(10) end end
+function testfun() while true do fiber.sleep(10) end end
---
...
-f = box.fiber.wrap(testfun)
+f = fiber.wrap(testfun)
---
...
f:cancel()
@@ -829,13 +829,13 @@ f:resume()
---
- error: 'fiber.resume(): the fiber is dead'
...
-fib_id = box.fiber.wrap(testfun):id()
+fib_id = fiber.wrap(testfun):id()
---
...
-box.fiber.find(fib_id):cancel()
+fiber.find(fib_id):cancel()
---
...
-box.fiber.find(fib_id)
+fiber.find(fib_id)
---
- null
...
diff --git a/test/box/fiber.test.lua b/test/box/fiber.test.lua
index cd6681c801ce5d14226ac301154dacf43f8e5f69..08d422aeac79b01dbfb5c65ef56ac3d693958ce5 100644
--- a/test/box/fiber.test.lua
+++ b/test/box/fiber.test.lua
@@ -1,4 +1,4 @@
-box.fiber = require('box.fiber')
+fiber = require('fiber')
space = box.schema.create_space('tweedledum')
space:create_index('primary', { type = 'hash' })
-- A test case for a race condition between ev_schedule
@@ -67,22 +67,22 @@ space:truncate()
--# setopt delimiter ';'
function y()
- box.fiber.detach('started')
+ fiber.detach('started')
space = box.space['tweedledum']
while true do
space:replace{1953719668, os.time()}
- box.fiber.sleep(0.001)
+ fiber.sleep(0.001)
end
end;
-f = box.fiber.create(y);
-box.fiber.resume(f);
-box.fiber.sleep(0.002);
-box.fiber.cancel(f);
-box.fiber.resume(f);
+f = fiber.create(y);
+fiber.resume(f);
+fiber.sleep(0.002);
+fiber.cancel(f);
+fiber.resume(f);
for k = 1, 1000, 1 do
- box.fiber.create(
+ fiber.create(
function()
- box.fiber.detach()
+ fiber.detach()
end
)
end;
@@ -90,29 +90,29 @@ end;
collectgarbage('collect')
-- check that these newly created fibers are garbage collected
-box.fiber.find(900)
-box.fiber.find(910)
-box.fiber.find(920)
-box.fiber.find()
-box.fiber.find('test')
+fiber.find(900)
+fiber.find(910)
+fiber.find(920)
+fiber.find()
+fiber.find('test')
-- https://github.com/tarantool/tarantool/issues/131
--- box.fiber.resume(box.fiber.cancel()) -- hang
-f = box.fiber.create(function() box.fiber.cancel(box.fiber.self()) end)
-box.fiber.resume(f)
+-- fiber.resume(fiber.cancel()) -- hang
+f = fiber.create(function() fiber.cancel(fiber.self()) end)
+fiber.resume(f)
f = nil
-- https://github.com/tarantool/tarantool/issues/119
-ftest = function() box.fiber.sleep(0.01 * math.random() ) return true end
+ftest = function() fiber.sleep(0.01 * math.random() ) return true end
--# setopt delimiter ';'
for i = 1, 10 do
result = {}
for j = 1, 300 do
- box.fiber.resume(box.fiber.create(function()
- box.fiber.detach()
+ fiber.resume(fiber.create(function()
+ fiber.detach()
table.insert(result, ftest())
end))
end
- while #result < 300 do box.fiber.sleep(0.01) end
+ while #result < 300 do fiber.sleep(0.01) end
end;
--# setopt delimiter ''
#result
@@ -120,17 +120,17 @@ end;
--# setopt delimiter ''
--
--
--- Test box.fiber.wrap()
+-- Test fiber.wrap()
--
-- This should try to infinitely create fibers,
-- but hit the fiber stack size limit and fail
-- with an error.
-f = function() box.fiber.wrap(f) end
+f = function() fiber.wrap(f) end
f()
--
-- Test argument passing
--
-f = function(a, b) box.fiber.wrap(function(arg) result = arg end, a..b) end
+f = function(a, b) fiber.wrap(function(arg) result = arg end, a..b) end
f('hello ', 'world')
result
f('bye ', 'world')
@@ -138,140 +138,140 @@ result
--
-- Test that the created fiber is detached
--
-box.fiber.wrap(function() result = box.fiber.status() end)
+fiber.wrap(function() result = fiber.status() end)
result
-- A test case for Bug#933487
-- tarantool crashed during shutdown if non running LUA fiber
-- was created
-f = box.fiber.create(function () return true end)
+f = fiber.create(function () return true end)
box.snapshot()
box.snapshot()
box.snapshot()
-box.fiber.resume(f)
-f = box.fiber.create(function () return true end)
+fiber.resume(f)
+f = fiber.create(function () return true end)
-box.fiber.sleep(0)
-box.fiber.sleep(0.01)
-box.fiber.sleep(0.0001)
-box.fiber.sleep('hello')
-box.fiber.sleep(box, 0.001)
-box.fiber.cancel(box.fiber.self())
-f = box.fiber.self()
+fiber.sleep(0)
+fiber.sleep(0.01)
+fiber.sleep(0.0001)
+fiber.sleep('hello')
+fiber.sleep(box, 0.001)
+fiber.cancel(fiber.self())
+f = fiber.self()
old_id = f:id()
-box.fiber.cancel(f)
-box.fiber.self():id() - old_id < 3
-box.fiber.cancel(box.fiber.self())
-box.fiber.self():id() - old_id < 5
-g = box.fiber.self()
+fiber.cancel(f)
+fiber.self():id() - old_id < 3
+fiber.cancel(fiber.self())
+fiber.self():id() - old_id < 5
+g = fiber.self()
f==g
-function r() f = box.fiber.create(r) return (box.fiber.resume(f)) end
+function r() f = fiber.create(r) return (fiber.resume(f)) end
r()
-f = box.fiber.create(print('hello')
-box.fiber.resume(f)
+f = fiber.create(print('hello'))
+fiber.resume(f)
-- test passing arguments in and out created fiber
function r(a, b) return a, b end
-f=box.fiber.create(r)
-box.fiber.resume(f)
-f=box.fiber.create(r)
-box.fiber.resume(f, 'hello')
-f=box.fiber.create(r)
-box.fiber.resume(f, 'hello', 'world')
-f=box.fiber.create(r)
-box.fiber.resume(f, 'hello', 'world', 'wide')
-function y(a, b) c=box.fiber.yield(a) return box.fiber.yield(b, c) end
-f=box.fiber.create(y)
-box.fiber.resume(f, 'hello', 'world')
-box.fiber.resume(f, 'wide')
-box.fiber.resume(f)
-function y() box.fiber.detach() while true do box.replace(0, 1953719668, os.time()) box.fiber.sleep(0.001) end end
-f = box.fiber.create(y)
-box.fiber.resume(f)
-box.fiber.sleep(0.002)
-box.fiber.cancel(f)
-box.fiber.resume(f)
+f=fiber.create(r)
+fiber.resume(f)
+f=fiber.create(r)
+fiber.resume(f, 'hello')
+f=fiber.create(r)
+fiber.resume(f, 'hello', 'world')
+f=fiber.create(r)
+fiber.resume(f, 'hello', 'world', 'wide')
+function y(a, b) c=fiber.yield(a) return fiber.yield(b, c) end
+f=fiber.create(y)
+fiber.resume(f, 'hello', 'world')
+fiber.resume(f, 'wide')
+fiber.resume(f)
+function y() fiber.detach() while true do box.replace(0, 1953719668, os.time()) fiber.sleep(0.001) end end
+f = fiber.create(y)
+fiber.resume(f)
+fiber.sleep(0.002)
+fiber.cancel(f)
+fiber.resume(f)
f=nil
-for k=1, 10000, 1 do box.fiber.create(function() box.fiber.detach() end) end
+for k=1, 10000, 1 do fiber.create(function() fiber.detach() end) end
collectgarbage('collect')
-- check that these newly created fibers are garbage collected
-box.fiber.find(9000)
-box.fiber.find(9010)
-box.fiber.find(9020)
+fiber.find(9000)
+fiber.find(9010)
+fiber.find(9020)
--- test box.fiber.status functions: invalid arguments
-box.fiber.status(1)
-box.fiber.status('fafa-gaga')
-box.fiber.status(nil)
+-- test fiber.status functions: invalid arguments
+fiber.status(1)
+fiber.status('fafa-gaga')
+fiber.status(nil)
--- A test case for Bug#911641 box.fiber.sleep() works incorrectly if
+-- A test case for Bug#911641 fiber.sleep() works incorrectly if
-- a fiber is attached.
-function r() return box.fiber.sleep(0.01) end
-f = box.fiber.create(r)
-box.fiber.resume(f)
-box.fiber.resume(f)
+function r() return fiber.sleep(0.01) end
+f = fiber.create(r)
+fiber.resume(f)
+fiber.resume(f)
--# setopt delimiter ';'
function r()
- box.fiber.yield(box.space.tweedledum:insert{0, 0, 1})
- box.fiber.yield(box.space.tweedledum:get{0})
- box.fiber.yield(box.space.tweedledum:truncate())
+ fiber.yield(box.space.tweedledum:insert{0, 0, 1})
+ fiber.yield(box.space.tweedledum:get{0})
+ fiber.yield(box.space.tweedledum:truncate())
end;
--# setopt delimiter ''
-f = box.fiber.create(r)
-box.fiber.resume(f)
-box.fiber.resume(f)
-box.fiber.resume(f)
-box.fiber.resume(f)
-function r() return box.fiber.yield(box.fiber.create(r)) end
+f = fiber.create(r)
+fiber.resume(f)
+fiber.resume(f)
+fiber.resume(f)
+fiber.resume(f)
+function r() return fiber.yield(fiber.create(r)) end
f = r()
-f1 = box.fiber.resume(f)
-f2 = box.fiber.resume(f1)
-f3 = box.fiber.resume(f2)
-f4 = box.fiber.resume(f3)
-f5 = box.fiber.resume(f4)
-f6 = box.fiber.resume(f5)
-f7 = box.fiber.resume(f6)
-f8 = box.fiber.resume(f7)
-f9 = box.fiber.resume(f8)
-f10 = box.fiber.resume(f9)
-f11 = box.fiber.resume(f10)
-f12 = box.fiber.resume(f11)
-f13 = box.fiber.resume(f12)
-f14 = box.fiber.resume(f13)
-f15 = box.fiber.resume(f14)
-f16 = box.fiber.resume(f15)
-f17 = box.fiber.resume(f16)
-box.fiber.resume(f)
-box.fiber.resume(f1)
-box.fiber.resume(f2)
-box.fiber.resume(f3)
-box.fiber.resume(f4)
-box.fiber.resume(f5)
-box.fiber.resume(f6)
-box.fiber.resume(f7)
-box.fiber.resume(f8)
-box.fiber.resume(f9)
-box.fiber.resume(f10)
-box.fiber.resume(f11)
-box.fiber.resume(f12)
-box.fiber.resume(f13)
-box.fiber.resume(f14)
-box.fiber.resume(f15)
-box.fiber.resume(f16)
+f1 = fiber.resume(f)
+f2 = fiber.resume(f1)
+f3 = fiber.resume(f2)
+f4 = fiber.resume(f3)
+f5 = fiber.resume(f4)
+f6 = fiber.resume(f5)
+f7 = fiber.resume(f6)
+f8 = fiber.resume(f7)
+f9 = fiber.resume(f8)
+f10 = fiber.resume(f9)
+f11 = fiber.resume(f10)
+f12 = fiber.resume(f11)
+f13 = fiber.resume(f12)
+f14 = fiber.resume(f13)
+f15 = fiber.resume(f14)
+f16 = fiber.resume(f15)
+f17 = fiber.resume(f16)
+fiber.resume(f)
+fiber.resume(f1)
+fiber.resume(f2)
+fiber.resume(f3)
+fiber.resume(f4)
+fiber.resume(f5)
+fiber.resume(f6)
+fiber.resume(f7)
+fiber.resume(f8)
+fiber.resume(f9)
+fiber.resume(f10)
+fiber.resume(f11)
+fiber.resume(f12)
+fiber.resume(f13)
+fiber.resume(f14)
+fiber.resume(f15)
+fiber.resume(f16)
f17 = nil
-function r() box.fiber.detach() box.fiber.sleep(1000) end
-f = box.fiber.create(r)
-box.fiber.resume(f)
-box.fiber.resume(f)
-box.fiber.cancel(f)
-box.fiber.resume(f)
--- Test box.fiber.name()
-old_name = box.fiber.name()
-box.fiber.name() == old_name
-box.fiber.self():name() == old_name
-box.fiber.name('hello fiber')
-box.fiber.name()
-box.fiber.self():name('bye fiber')
-box.fiber.self():name()
-box.fiber.self():name(old_name)
+function r() fiber.detach() fiber.sleep(1000) end
+f = fiber.create(r)
+fiber.resume(f)
+fiber.resume(f)
+fiber.cancel(f)
+fiber.resume(f)
+-- Test fiber.name()
+old_name = fiber.name()
+fiber.name() == old_name
+fiber.self():name() == old_name
+fiber.name('hello fiber')
+fiber.name()
+fiber.self():name('bye fiber')
+fiber.self():name()
+fiber.self():name(old_name)
space:drop()
@@ -280,11 +280,11 @@ dofile("fiber.lua")
-- print run fiber's test
box_fiber_run_test()
-function testfun() while true do box.fiber.sleep(10) end end
-f = box.fiber.wrap(testfun)
+function testfun() while true do fiber.sleep(10) end end
+f = fiber.wrap(testfun)
f:cancel()
f:resume()
-fib_id = box.fiber.wrap(testfun):id()
-box.fiber.find(fib_id):cancel()
-box.fiber.find(fib_id)
+fib_id = fiber.wrap(testfun):id()
+fiber.find(fib_id):cancel()
+fiber.find(fib_id)
box.fiber = nil
diff --git a/test/box/ipc.result b/test/box/ipc.result
index 73e87aed2d529a6315407ca8947d57e3c68d24a0..ff17f0048e6a83a38fd88583f08191230637b935 100644
--- a/test/box/ipc.result
+++ b/test/box/ipc.result
@@ -1,7 +1,7 @@
-boxfiber = require('box.fiber')
+fiber = require('fiber')
---
...
-ch = boxfiber.channel()
+ch = fiber.channel()
---
...
ch:is_full()
@@ -56,7 +56,7 @@ buffer = {}
---
...
--# setopt delimiter ';'
-tfbr = boxfiber.wrap(
+tfbr = fiber.wrap(
function()
while true do
table.insert(buffer, ch:get())
@@ -105,7 +105,7 @@ ch:has_writers()
---
- false
...
-boxfiber.cancel(tfbr)
+fiber.cancel(tfbr)
---
...
ch:has_readers()
@@ -171,7 +171,7 @@ ch:is_empty()
- true
...
--# setopt delimiter ';'
-tfbr = boxfiber.wrap(
+tfbr = fiber.wrap(
function()
while true do
local v = ch:get()
@@ -181,7 +181,7 @@ tfbr = boxfiber.wrap(
);
---
...
-tfbr2 = boxfiber.wrap(
+tfbr2 = fiber.wrap(
function()
while true do
local v = ch:get()
@@ -290,7 +290,7 @@ buffer
- - tfbr2
- '45'
...
-ch = boxfiber.channel(1)
+ch = fiber.channel(1)
---
...
ch:is_closed()
@@ -300,7 +300,7 @@ ch:is_closed()
passed = false
---
...
-type(boxfiber.wrap(function() if ch:get() == nil then passed = true end end))
+type(fiber.wrap(function() if ch:get() == nil then passed = true end end))
---
- userdata
...
@@ -327,7 +327,7 @@ ch:is_closed()
---
- true
...
-ch = boxfiber.channel(1)
+ch = fiber.channel(1)
---
...
ch:put(true)
@@ -341,7 +341,7 @@ ch:is_closed()
passed = false
---
...
-type(boxfiber.wrap(function() if ch:put(true) == false then passed = true end end))
+type(fiber.wrap(function() if ch:put(true) == false then passed = true end end))
---
- userdata
...
@@ -379,16 +379,16 @@ res= { }
---
...
--# setopt delimiter ';'
-for i = 1, 10 do table.insert(chs, boxfiber.channel()) end;
+for i = 1, 10 do table.insert(chs, fiber.channel()) end;
---
...
for i = 1, 10 do
- local no = i boxfiber.wrap(
+ local no = i fiber.wrap(
function()
- boxfiber.self():name('pusher')
+ fiber.self():name('pusher')
while true do
chs[no]:put({no})
- boxfiber.sleep(0.001 * math.random())
+ fiber.sleep(0.001 * math.random())
end
end
)
@@ -396,9 +396,9 @@ end;
---
...
for i = 1, 10 do
- local no = i boxfiber.wrap(
+ local no = i fiber.wrap(
function()
- boxfiber.self():name('receiver')
+ fiber.self():name('receiver')
while true do
local r = chs[no]:get(math.random() * .001)
if r ~= nil and r[1] == no then
@@ -406,7 +406,7 @@ for i = 1, 10 do
elseif r ~= nil then
break
end
- boxfiber.sleep(0.001 * math.random())
+ fiber.sleep(0.001 * math.random())
count = count + 1
end
res[no] = false
@@ -415,7 +415,7 @@ for i = 1, 10 do
end;
---
...
-for i = 1, 100 do boxfiber.sleep(0.01) if count > 2000 then break end end;
+for i = 1, 100 do fiber.sleep(0.01) if count > 2000 then break end end;
---
...
count > 2000, #res, res;
diff --git a/test/box/ipc.test.lua b/test/box/ipc.test.lua
index f6ec6756b1e517a444a6109ab242d3e3dfcec761..4f53a2e697239937b4fb9467eb99e29a14f148d8 100644
--- a/test/box/ipc.test.lua
+++ b/test/box/ipc.test.lua
@@ -1,6 +1,6 @@
-boxfiber = require('box.fiber')
+fiber = require('fiber')
-ch = boxfiber.channel()
+ch = fiber.channel()
ch:is_full()
ch:is_empty()
ch:get(.1)
@@ -15,7 +15,7 @@ ch:is_full()
ch:is_empty()
buffer = {}
--# setopt delimiter ';'
-tfbr = boxfiber.wrap(
+tfbr = fiber.wrap(
function()
while true do
table.insert(buffer, ch:get())
@@ -30,7 +30,7 @@ end;
t
ch:has_readers()
ch:has_writers()
-boxfiber.cancel(tfbr)
+fiber.cancel(tfbr)
ch:has_readers()
ch:has_writers()
@@ -48,7 +48,7 @@ ch:get()
ch:is_full()
ch:is_empty()
--# setopt delimiter ';'
-tfbr = boxfiber.wrap(
+tfbr = fiber.wrap(
function()
while true do
local v = ch:get()
@@ -56,7 +56,7 @@ tfbr = boxfiber.wrap(
end
end
);
-tfbr2 = boxfiber.wrap(
+tfbr2 = fiber.wrap(
function()
while true do
local v = ch:get()
@@ -82,10 +82,10 @@ for i = 35, 45 do table.insert(t, ch:put(i)) end
t
buffer
-ch = boxfiber.channel(1)
+ch = fiber.channel(1)
ch:is_closed()
passed = false
-type(boxfiber.wrap(function() if ch:get() == nil then passed = true end end))
+type(fiber.wrap(function() if ch:get() == nil then passed = true end end))
ch:close()
passed
ch:get()
@@ -93,11 +93,11 @@ ch:get()
ch:put(10)
ch:is_closed()
-ch = boxfiber.channel(1)
+ch = fiber.channel(1)
ch:put(true)
ch:is_closed()
passed = false
-type(boxfiber.wrap(function() if ch:put(true) == false then passed = true end end))
+type(fiber.wrap(function() if ch:put(true) == false then passed = true end end))
ch:close()
passed
ch:get()
@@ -112,25 +112,25 @@ chs= {}
count= 0
res= { }
--# setopt delimiter ';'
-for i = 1, 10 do table.insert(chs, boxfiber.channel()) end;
+for i = 1, 10 do table.insert(chs, fiber.channel()) end;
for i = 1, 10 do
- local no = i boxfiber.wrap(
+ local no = i fiber.wrap(
function()
- boxfiber.self():name('pusher')
+ fiber.self():name('pusher')
while true do
chs[no]:put({no})
- boxfiber.sleep(0.001 * math.random())
+ fiber.sleep(0.001 * math.random())
end
end
)
end;
for i = 1, 10 do
- local no = i boxfiber.wrap(
+ local no = i fiber.wrap(
function()
- boxfiber.self():name('receiver')
+ fiber.self():name('receiver')
while true do
local r = chs[no]:get(math.random() * .001)
if r ~= nil and r[1] == no then
@@ -138,7 +138,7 @@ for i = 1, 10 do
elseif r ~= nil then
break
end
- boxfiber.sleep(0.001 * math.random())
+ fiber.sleep(0.001 * math.random())
count = count + 1
end
res[no] = false
@@ -146,7 +146,7 @@ for i = 1, 10 do
)
end;
-for i = 1, 100 do boxfiber.sleep(0.01) if count > 2000 then break end end;
+for i = 1, 100 do fiber.sleep(0.01) if count > 2000 then break end end;
count > 2000, #res, res;
diff --git a/test/box/lua/fiber.lua b/test/box/lua/fiber.lua
index 55cc1be1bbc8927a2c6cd58e52fe50523dd74099..adb53b8ef719ac0c3e4387182de2bfc31147f831 100644
--- a/test/box/lua/fiber.lua
+++ b/test/box/lua/fiber.lua
@@ -18,7 +18,7 @@ local result = {}
-- odd printer
local function odd(x)
table.insert(result,'A: odd '..tostring(x))
- box.fiber.yield(x)
+ fiber.yield(x)
table.insert(result,'B: odd '..tostring(x))
end
@@ -33,11 +33,11 @@ end
-- printer task routine main function
local function printer_task_routine(x)
- table.insert(result, "printer: tester status = " .. box.fiber.status(tester_task))
- table.insert(result, "printer: printer status = " .. box.fiber.status(printer_task))
+ table.insert(result, "printer: tester status = " .. fiber.status(tester_task))
+ table.insert(result, "printer: printer status = " .. fiber.status(printer_task))
for i = 1, x do
if i == 3 then
- box.fiber.yield(-1)
+ fiber.yield(-1)
end
if i % 2 == 0 then
even(i)
@@ -54,14 +54,14 @@ end
-- tester task routine main function
local function tester_task_routine()
- printer_task = box.fiber.create(printer_task_routine)
- table.insert(result, "tester: status(tester) = " .. box.fiber.status(tester_task))
- table.insert(result, "tester: status(printer) = " .. box.fiber.status(printer_task))
+ printer_task = fiber.create(printer_task_routine)
+ table.insert(result, "tester: status(tester) = " .. fiber.status(tester_task))
+ table.insert(result, "tester: status(printer) = " .. fiber.status(printer_task))
count = 1
- while box.fiber.status(printer_task) ~= "dead" do
+ while fiber.status(printer_task) ~= "dead" do
table.insert(result, "count: " .. tostring(count))
- box.fiber.resume(printer_task, 5)
- table.insert(result, "status: " .. box.fiber.status(printer_task))
+ fiber.resume(printer_task, 5)
+ table.insert(result, "status: " .. fiber.status(printer_task))
count = count + 1
end
end
@@ -74,7 +74,7 @@ end
-- run fiber test
function box_fiber_run_test()
-- run tester
- tester_task = box.fiber.create(tester_task_routine)
- box.fiber.resume(tester_task)
+ tester_task = fiber.create(tester_task_routine)
+ fiber.resume(tester_task)
return result
end
diff --git a/test/box/misc.result b/test/box/misc.result
index 1d8dbee9a3cff767e2ebe8c0567cd1ea942a012e..85762430ad92893e9fbfd7569f4a6ddb1f249caf 100644
--- a/test/box/misc.result
+++ b/test/box/misc.result
@@ -17,9 +17,7 @@ t = {} for n in pairs(box) do table.insert(t, tostring(n)) end table.sort(t)
t
---
- - cfg
- - coredump
- counter
- - errinj
- error
- index
- info
diff --git a/test/box/msgpack.result b/test/box/msgpack.result
index 904f4f460ee051553e6fe34765281fd308bf8f9c..8a3da18a46d7b5949e7bd184bc02228ecb457e82 100644
--- a/test/box/msgpack.result
+++ b/test/box/msgpack.result
@@ -4,10 +4,10 @@
ffi = require('ffi')
---
...
-msgpack = require('box.msgpack')
+msgpack = require('msgpack')
---
...
-msgpackffi = require('box.msgpackffi')
+msgpackffi = require('msgpackffi')
---
...
msgpack.encode()
@@ -615,5 +615,5 @@ offset
...
a, offset = msgpackffi.decode_unchecked(dump, offset)
---
-- error: 'builtin/box.msgpackffi.lua:460: offset = 9 is out of bounds [1..8]'
+- error: 'builtin/msgpackffi.lua:460: offset = 9 is out of bounds [1..8]'
...
diff --git a/test/box/msgpack.test.lua b/test/box/msgpack.test.lua
index 987c3a3c47d0f85efbe0251e2152128f53bd0560..34091278a7ef2093876b43405bb4de35211e7551 100644
--- a/test/box/msgpack.test.lua
+++ b/test/box/msgpack.test.lua
@@ -3,8 +3,8 @@
--------------------------------------------------------------------------------
ffi = require('ffi')
-msgpack = require('box.msgpack')
-msgpackffi = require('box.msgpackffi')
+msgpack = require('msgpack')
+msgpackffi = require('msgpackffi')
msgpack.encode()
msgpack.decode()
diff --git a/test/box/net.box.result b/test/box/net.box.result
index d0a6086106f1caaee940c2b3dff432b4220b4d41..eb71bb284d99bccf92235007c2a12f57a5e5859e 100644
--- a/test/box/net.box.result
+++ b/test/box/net.box.result
@@ -1,4 +1,4 @@
-box.fiber = require('box.fiber')
+fiber = require('fiber')
---
...
space = box.schema.create_space('tweedledum')
@@ -202,18 +202,16 @@ remote:call('box.space.tweedledum:select', {123})
---
- - [123, 'test1', 'test2']
...
-slf, foo = box.call_loadproc('box.net.self:select')
+slf, foo = require('box.internal').call_loadproc('box.net.self:select')
---
-- error: '[string "slf, foo = box.call_loadproc(''box.net.self:se..."]:1: attempt
- to call field ''call_loadproc'' (a nil value)'
...
type(slf)
---
-- nil
+- function
...
type(foo)
---
-- nil
+- table
...
space:update(123, {{'=', 1, 'test1-updated'}})
---
@@ -337,23 +335,23 @@ box.net.self:delete(space.id, 12346)
---
- [12346, 'test1', 'test2']
...
-remote:call('box.fiber.sleep', .01)
+remote:call('fiber.sleep', .01)
---
- []
...
-remote:timeout(0.01):call('box.fiber.sleep', 10)
+remote:timeout(0.01):call('fiber.sleep', 10)
---
- null
...
--# setopt delimiter ';'
-pstart = box.fiber.time();
+pstart = fiber.time();
---
...
parallel = {};
---
...
function parallel_foo(id)
- box.fiber.sleep(math.random() * .05)
+ fiber.sleep(math.random() * .05)
return id
end;
---
@@ -363,10 +361,10 @@ parallel_foo('abc');
- abc
...
for i = 1, 20 do
- box.fiber.resume(
- box.fiber.create(
+ fiber.resume(
+ fiber.create(
function()
- box.fiber.detach()
+ fiber.detach()
local s = string.format('%07d', i)
local so = remote:call('parallel_foo', s)
table.insert(parallel, s == so[1][0])
@@ -380,7 +378,7 @@ for i = 1, 20 do
if #parallel == 20 then
break
end
- box.fiber.sleep(0.1)
+ fiber.sleep(0.1)
end;
---
...
@@ -412,7 +410,7 @@ parallel
---
- 20
...
-box.fiber.time() - pstart < 0.5
+fiber.time() - pstart < 0.5
---
- true
...
@@ -438,11 +436,11 @@ remote:close()
...
remote:close()
---
-- error: '[string "-- box_net.lua (internal file)..."]:541: box.net.box: already closed'
+- error: '[string "-- box_net.lua (internal file)..."]:542: box.net.box: already closed'
...
remote:ping()
---
-- error: '[string "-- box_net.lua (internal file)..."]:546: box.net.box: connection
+- error: '[string "-- box_net.lua (internal file)..."]:547: box.net.box: connection
was closed'
...
space:drop()
@@ -451,3 +449,6 @@ space:drop()
box.schema.user.revoke('guest', 'read,write,execute', 'universe')
---
...
+fiber = nil
+---
+...
diff --git a/test/box/net.box.test.lua b/test/box/net.box.test.lua
index e98a7d85b3257df495ecefbe1267facacfeabcdb..b9726d9f348b13ec498ca3cf50a1554e01cbb0cb 100644
--- a/test/box/net.box.test.lua
+++ b/test/box/net.box.test.lua
@@ -1,4 +1,4 @@
-box.fiber = require('box.fiber')
+fiber = require('fiber')
space = box.schema.create_space('tweedledum')
space:create_index('primary', { type = 'tree'})
box.schema.user.grant('guest', 'read,write,execute', 'universe')
@@ -62,7 +62,7 @@ box.space.tweedledum:select({123})
remote:call('box.space.tweedledum:select', 123)
remote:call('box.space.tweedledum:select', {123})
-slf, foo = box.call_loadproc('box.net.self:select')
+slf, foo = require('box.internal').call_loadproc('box.net.self:select')
type(slf)
type(foo)
@@ -106,22 +106,22 @@ box.net.self:update(space.id, 12347, {{ '=', 1, 'test11' }})
box.net.self:delete(space.id, 12346)
-remote:call('box.fiber.sleep', .01)
-remote:timeout(0.01):call('box.fiber.sleep', 10)
+remote:call('fiber.sleep', .01)
+remote:timeout(0.01):call('fiber.sleep', 10)
--# setopt delimiter ';'
-pstart = box.fiber.time();
+pstart = fiber.time();
parallel = {};
function parallel_foo(id)
- box.fiber.sleep(math.random() * .05)
+ fiber.sleep(math.random() * .05)
return id
end;
parallel_foo('abc');
for i = 1, 20 do
- box.fiber.resume(
- box.fiber.create(
+ fiber.resume(
+ fiber.create(
function()
- box.fiber.detach()
+ fiber.detach()
local s = string.format('%07d', i)
local so = remote:call('parallel_foo', s)
table.insert(parallel, s == so[1][0])
@@ -133,12 +133,12 @@ for i = 1, 20 do
if #parallel == 20 then
break
end
- box.fiber.sleep(0.1)
+ fiber.sleep(0.1)
end;
--# setopt delimiter ''
parallel
#parallel
-box.fiber.time() - pstart < 0.5
+fiber.time() - pstart < 0.5
@@ -153,3 +153,5 @@ remote:ping()
space:drop()
box.schema.user.revoke('guest', 'read,write,execute', 'universe')
+
+fiber = nil
diff --git a/test/box/print.result b/test/box/print.result
index 4cb02cfe0c866b654e7f6e061011485896817e7c..e4cdb1491ad3005a4d3eb49942345c7f0ff09ac2 100644
--- a/test/box/print.result
+++ b/test/box/print.result
@@ -4,11 +4,11 @@ print("Hello, world")
io = require('io')
---
...
-require('box.fiber').wrap(function() print('Ehllo, world') io.flush() end)
+require('fiber').wrap(function() print('Ehllo, world') io.flush() end)
---
- null
...
-require('box.fiber').sleep(0.1)
+require('fiber').sleep(0.1)
---
...
Check log line
diff --git a/test/box/print.test.py b/test/box/print.test.py
index 8784cb978fb309860a3b0c09218d2ddd2b150ea6..9b0f56f0ec8fea0b6a439a1c313a9cbe32df41f2 100644
--- a/test/box/print.test.py
+++ b/test/box/print.test.py
@@ -12,8 +12,8 @@ log = server.logfile
f = open(log, "r")
f.seek(0, 2)
-admin("require('box.fiber').wrap(function() print('Ehllo, world') io.flush() end)")
-admin("require('box.fiber').sleep(0.1)")
+admin("require('fiber').wrap(function() print('Ehllo, world') io.flush() end)")
+admin("require('fiber').sleep(0.1)")
line = f.readline()
print("Check log line")
print("---")
diff --git a/test/box/session.result b/test/box/session.result
index a5db9908fcf54c21501862a3995df8fdb9d37e10..2137943bd424abef491fd8d139c37385a06a30c8 100644
--- a/test/box/session.result
+++ b/test/box/session.result
@@ -1,7 +1,7 @@
-box.session = require('box.session')
+session = require('session')
---
...
-box.fiber = require('box.fiber')
+fiber = require('fiber')
---
...
space = box.schema.create_space('tweedledum')
@@ -10,41 +10,41 @@ space = box.schema.create_space('tweedledum')
space:create_index('primary', { type = 'hash' })
---
...
-box.session.exists(box.session.id())
+session.exists(session.id())
---
- 1
...
-box.session.exists()
+session.exists()
---
- error: 'session.exists(sid): bad arguments'
...
-box.session.exists(1, 2, 3)
+session.exists(1, 2, 3)
---
- error: 'session.exists(sid): bad arguments'
...
-box.session.exists(1234567890)
+session.exists(1234567890)
---
- 0
...
-- check session.id()
-box.session.id() > 0
+session.id() > 0
---
- true
...
-f = box.fiber.create(function() box.fiber.detach() failed = box.session.id() ~= 0 end)
+f = fiber.create(function() fiber.detach() failed = session.id() ~= 0 end)
---
...
-box.fiber.resume(f)
+fiber.resume(f)
---
...
failed
---
- false
...
-f1 = box.fiber.create(function() if box.session.id() == 0 then failed = true end end)
+f1 = fiber.create(function() if session.id() == 0 then failed = true end end)
---
...
-box.fiber.resume(f1)
+fiber.resume(f1)
---
- true
...
@@ -52,7 +52,7 @@ failed
---
- false
...
-box.session.peer() == box.session.peer(box.session.id())
+session.peer() == session.peer(session.id())
---
- true
...
@@ -60,60 +60,60 @@ box.session.peer() == box.session.peer(box.session.id())
function noop() end
---
...
-box.session.on_connect(noop)
+session.on_connect(noop)
---
...
-box.session.on_disconnect(noop)
+session.on_disconnect(noop)
---
...
-- check it's possible to reset these triggers
function fail() error('hear') end
---
...
-box.session.on_connect(fail, noop)
+session.on_connect(fail, noop)
---
...
-box.session.on_disconnect(fail, noop)
+session.on_disconnect(fail, noop)
---
...
-- check on_connect/on_disconnect argument count and type
-box.session.on_connect()
+session.on_connect()
---
- error: 'trigger reset: incorrect arguments'
...
-box.session.on_disconnect()
+session.on_disconnect()
---
- error: 'trigger reset: incorrect arguments'
...
-box.session.on_connect(function() end, function() end)
+session.on_connect(function() end, function() end)
---
- error: Trigger is not found
...
-box.session.on_disconnect(function() end, function() end)
+session.on_disconnect(function() end, function() end)
---
- error: Trigger is not found
...
-box.session.on_connect(1, 2)
+session.on_connect(1, 2)
---
- error: 'trigger reset: incorrect arguments'
...
-box.session.on_disconnect(1, 2)
+session.on_disconnect(1, 2)
---
- error: 'trigger reset: incorrect arguments'
...
-box.session.on_connect(1)
+session.on_connect(1)
---
- error: 'trigger reset: incorrect arguments'
...
-box.session.on_disconnect(1)
+session.on_disconnect(1)
---
- error: 'trigger reset: incorrect arguments'
...
-- use of nil to clear the trigger
-box.session.on_connect(nil, fail)
+session.on_connect(nil, fail)
---
...
-box.session.on_disconnect(nil, fail)
+session.on_disconnect(nil, fail)
---
...
-- check how connect/disconnect triggers work
@@ -123,10 +123,10 @@ function inc() active_connections = active_connections + 1 end
function dec() active_connections = active_connections - 1 end
---
...
-box.session.on_connect(inc)
+session.on_connect(inc)
---
...
-box.session.on_disconnect(dec)
+session.on_disconnect(dec)
---
...
active_connections = 0
@@ -144,45 +144,45 @@ active_connections
...
--# drop connection con_one
--# drop connection con_two
-box.fiber.sleep(0) -- yield
+fiber.sleep(0) -- yield
---
...
active_connections
---
- 0
...
-box.session.on_connect(nil, inc)
+session.on_connect(nil, inc)
---
...
-box.session.on_disconnect(nil, dec)
+session.on_disconnect(nil, dec)
---
...
-- write audit trail of connect/disconnect into a space
-function audit_connect() box.space['tweedledum']:insert{box.session.id()} end
+function audit_connect() box.space['tweedledum']:insert{session.id()} end
---
...
-function audit_disconnect() box.space['tweedledum']:delete{box.session.id()} end
+function audit_disconnect() box.space['tweedledum']:delete{session.id()} end
---
...
-box.session.on_connect(audit_connect)
+session.on_connect(audit_connect)
---
...
-box.session.on_disconnect(audit_disconnect)
+session.on_disconnect(audit_disconnect)
---
...
--# create connection con_three to default
--# set connection con_three
-space:get{box.session.id()}[0] == box.session.id()
+space:get{session.id()}[0] == session.id()
---
- true
...
--# set connection default
--# drop connection con_three
-- cleanup
-box.session.on_connect(nil, audit_connect)
+session.on_connect(nil, audit_connect)
---
...
-box.session.on_disconnect(nil, audit_disconnect)
+session.on_disconnect(nil, audit_disconnect)
---
...
active_connections
@@ -192,17 +192,17 @@ active_connections
space:drop()
---
...
-box.session.uid()
+session.uid()
---
- 1
...
-box.session.user()
+session.user()
---
- admin
...
-box.fiber = nil
+fiber = nil
---
...
-box.session = nil
+session = nil
---
...
diff --git a/test/box/session.storage.result b/test/box/session.storage.result
index 81c3b02504678ba90839068179df2eb06178630c..79954722d2b2d994183bc518a632fe1180e44df1 100644
--- a/test/box/session.storage.result
+++ b/test/box/session.storage.result
@@ -1,32 +1,32 @@
-print('box.session.storage')
+print('session.storage')
---
...
-box.session = require('box.session')
+session = require('session')
---
...
-dump = function(data) return "'" .. require('box.json').encode(data) .. "'" end
+dump = function(data) return "'" .. require('json').encode(data) .. "'" end
---
...
-type(box.session.id())
+type(session.id())
---
- number
...
-box.session.unknown_field
+session.unknown_field
---
- null
...
-type(box.session.storage)
+type(session.storage)
---
- table
...
-box.session.storage.abc = 'cde'
+session.storage.abc = 'cde'
---
...
-box.session.storage.abc
+session.storage.abc
---
- cde
...
-all = getmetatable(box.session).aggregate_storage
+all = getmetatable(session).aggregate_storage
---
...
dump(all)
@@ -35,33 +35,33 @@ dump(all)
...
--# create connection second to default
--# set connection second
-type(box.session.storage)
+type(session.storage)
---
- table
...
-type(box.session.storage.abc)
+type(session.storage.abc)
---
- nil
...
-box.session.storage.abc = 'def'
+session.storage.abc = 'def'
---
...
-box.session.storage.abc
+session.storage.abc
---
- def
...
--# set connection default
-box.session.storage.abc
+session.storage.abc
---
- cde
...
--# set connection second
-dump(all[box.session.id()])
+dump(all[session.id()])
---
- '''{"abc":"def"}'''
...
--# set connection default
-dump(all[box.session.id()])
+dump(all[session.id()])
---
- '''{"abc":"cde"}'''
...
@@ -75,7 +75,7 @@ for k,v in pairs(all) do table.insert(tres1, v.abc) end
---
...
--# drop connection second
-require('box.fiber').sleep(.01)
+require('fiber').sleep(.01)
---
...
for k,v in pairs(all) do table.insert(tres2, v.abc) end
@@ -95,6 +95,6 @@ dump(tres2)
---
- '''["cde"]'''
...
-box.session = nil
+session = nil
---
...
diff --git a/test/box/session.storage.test.lua b/test/box/session.storage.test.lua
index a53e76ac0b012fddda26f846f005237c60ccc151..c0ec984500f2ee8384be567af78e250325cf2735 100644
--- a/test/box/session.storage.test.lua
+++ b/test/box/session.storage.test.lua
@@ -1,42 +1,42 @@
-print('box.session.storage')
-box.session = require('box.session')
+print('session.storage')
+session = require('session')
-dump = function(data) return "'" .. require('box.json').encode(data) .. "'" end
+dump = function(data) return "'" .. require('json').encode(data) .. "'" end
-type(box.session.id())
-box.session.unknown_field
+type(session.id())
+session.unknown_field
-type(box.session.storage)
-box.session.storage.abc = 'cde'
-box.session.storage.abc
+type(session.storage)
+session.storage.abc = 'cde'
+session.storage.abc
-all = getmetatable(box.session).aggregate_storage
+all = getmetatable(session).aggregate_storage
dump(all)
--# create connection second to default
--# set connection second
-type(box.session.storage)
-type(box.session.storage.abc)
-box.session.storage.abc = 'def'
-box.session.storage.abc
+type(session.storage)
+type(session.storage.abc)
+session.storage.abc = 'def'
+session.storage.abc
--# set connection default
-box.session.storage.abc
+session.storage.abc
--# set connection second
-dump(all[box.session.id()])
+dump(all[session.id()])
--# set connection default
-dump(all[box.session.id()])
+dump(all[session.id()])
tres1 = {}
tres2 = {}
for k,v in pairs(all) do table.insert(tres1, v.abc) end
--# drop connection second
-require('box.fiber').sleep(.01)
+require('fiber').sleep(.01)
for k,v in pairs(all) do table.insert(tres2, v.abc) end
table.sort(tres1)
@@ -44,4 +44,4 @@ table.sort(tres2)
dump(tres1)
dump(tres2)
-box.session = nil
+session = nil
diff --git a/test/box/session.test.lua b/test/box/session.test.lua
index 033e68d87db1d6a72d02b7ef5185df7735c639f3..29c01fb166609bb1b44e8fa9944f9424e6920d46 100644
--- a/test/box/session.test.lua
+++ b/test/box/session.test.lua
@@ -1,56 +1,56 @@
-box.session = require('box.session')
-box.fiber = require('box.fiber')
+session = require('session')
+fiber = require('fiber')
space = box.schema.create_space('tweedledum')
space:create_index('primary', { type = 'hash' })
-box.session.exists(box.session.id())
-box.session.exists()
-box.session.exists(1, 2, 3)
-box.session.exists(1234567890)
+session.exists(session.id())
+session.exists()
+session.exists(1, 2, 3)
+session.exists(1234567890)
-- check session.id()
-box.session.id() > 0
-f = box.fiber.create(function() box.fiber.detach() failed = box.session.id() ~= 0 end)
-box.fiber.resume(f)
+session.id() > 0
+f = fiber.create(function() fiber.detach() failed = session.id() ~= 0 end)
+fiber.resume(f)
failed
-f1 = box.fiber.create(function() if box.session.id() == 0 then failed = true end end)
-box.fiber.resume(f1)
+f1 = fiber.create(function() if session.id() == 0 then failed = true end end)
+fiber.resume(f1)
failed
-box.session.peer() == box.session.peer(box.session.id())
+session.peer() == session.peer(session.id())
-- check on_connect/on_disconnect triggers
function noop() end
-box.session.on_connect(noop)
-box.session.on_disconnect(noop)
+session.on_connect(noop)
+session.on_disconnect(noop)
-- check it's possible to reset these triggers
function fail() error('hear') end
-box.session.on_connect(fail, noop)
-box.session.on_disconnect(fail, noop)
+session.on_connect(fail, noop)
+session.on_disconnect(fail, noop)
-- check on_connect/on_disconnect argument count and type
-box.session.on_connect()
-box.session.on_disconnect()
+session.on_connect()
+session.on_disconnect()
-box.session.on_connect(function() end, function() end)
-box.session.on_disconnect(function() end, function() end)
+session.on_connect(function() end, function() end)
+session.on_disconnect(function() end, function() end)
-box.session.on_connect(1, 2)
-box.session.on_disconnect(1, 2)
+session.on_connect(1, 2)
+session.on_disconnect(1, 2)
-box.session.on_connect(1)
-box.session.on_disconnect(1)
+session.on_connect(1)
+session.on_disconnect(1)
-- use of nil to clear the trigger
-box.session.on_connect(nil, fail)
-box.session.on_disconnect(nil, fail)
+session.on_connect(nil, fail)
+session.on_disconnect(nil, fail)
-- check how connect/disconnect triggers work
function inc() active_connections = active_connections + 1 end
function dec() active_connections = active_connections - 1 end
-box.session.on_connect(inc)
-box.session.on_disconnect(dec)
+session.on_connect(inc)
+session.on_disconnect(dec)
active_connections = 0
--# create connection con_one to default
active_connections
@@ -58,32 +58,32 @@ active_connections
active_connections
--# drop connection con_one
--# drop connection con_two
-box.fiber.sleep(0) -- yield
+fiber.sleep(0) -- yield
active_connections
-box.session.on_connect(nil, inc)
-box.session.on_disconnect(nil, dec)
+session.on_connect(nil, inc)
+session.on_disconnect(nil, dec)
-- write audit trail of connect/disconnect into a space
-function audit_connect() box.space['tweedledum']:insert{box.session.id()} end
-function audit_disconnect() box.space['tweedledum']:delete{box.session.id()} end
-box.session.on_connect(audit_connect)
-box.session.on_disconnect(audit_disconnect)
+function audit_connect() box.space['tweedledum']:insert{session.id()} end
+function audit_disconnect() box.space['tweedledum']:delete{session.id()} end
+session.on_connect(audit_connect)
+session.on_disconnect(audit_disconnect)
--# create connection con_three to default
--# set connection con_three
-space:get{box.session.id()}[0] == box.session.id()
+space:get{session.id()}[0] == session.id()
--# set connection default
--# drop connection con_three
-- cleanup
-box.session.on_connect(nil, audit_connect)
-box.session.on_disconnect(nil, audit_disconnect)
+session.on_connect(nil, audit_connect)
+session.on_disconnect(nil, audit_disconnect)
active_connections
space:drop()
-box.session.uid()
-box.session.user()
-box.fiber = nil
-box.session = nil
+session.uid()
+session.user()
+fiber = nil
+session = nil
diff --git a/test/box/socket.result b/test/box/socket.result
index 105e1ada272ca09df174171fc8feaa0518cc89e3..38dc37efa0056f889cecece2e831789ac1a49dc4 100644
--- a/test/box/socket.result
+++ b/test/box/socket.result
@@ -1,7 +1,7 @@
-boxsocket = require('box.socket')
+socket = require('socket')
---
...
-s = boxsocket.udp()
+s = socket.udp()
---
...
type(s)
@@ -11,7 +11,7 @@ type(s)
s:close()
---
...
-s = boxsocket.tcp()
+s = socket.tcp()
---
...
type(s)
@@ -102,13 +102,13 @@ s:close()
...
s:send()
---
-- error: 'box.socket: socket is not initialized'
+- error: 'socket: socket is not initialized'
...
s:send(1)
---
-- error: 'box.socket: socket is not initialized'
+- error: 'socket: socket is not initialized'
...
-s = boxsocket.tcp()
+s = socket.tcp()
---
...
type(s:connect('127.0.0.1', '30303'))
@@ -178,7 +178,7 @@ s:close()
...
s:recv()
---
-- error: 'box.socket: socket is not initialized'
+- error: 'socket: socket is not initialized'
...
type(s:connect('127.0.0.1', '30308'))
---
@@ -838,7 +838,7 @@ s:close()
---
...
ping
-s = boxsocket.udp()
+s = socket.udp()
---
...
type(s:sendto('ping', '127.0.0.1', '30302'))
@@ -861,7 +861,7 @@ s:recv(4)
s:close()
---
...
-s = boxsocket.udp()
+s = socket.udp()
---
...
type(s:bind('127.0.0.1', '30301'))
@@ -902,7 +902,7 @@ ping
s:close()
---
...
- replies = 0 packet = require('box.msgpack').encode({[0] = 64, [1] = 0}) packet = require('box.msgpack').encode(packet:len())..packet function bug1160869() local s = boxsocket.tcp() s:connect('127.0.0.1', string.gsub(box.cfg.primary_port, '^.*:', '')) s:recv(128) require('box.fiber').wrap(function() while true do _, status = s:recv(18) if status == "eof" then error("unexpected eof") end replies = replies + 1 end end) return s:send(packet) end
+ replies = 0 packet = require('msgpack').encode({[0] = 64, [1] = 0}) packet = require('msgpack').encode(packet:len())..packet function bug1160869() local s = socket.tcp() s:connect('127.0.0.1', string.gsub(box.cfg.primary_port, '^.*:', '')) s:recv(128) require('fiber').wrap(function() while true do _, status = s:recv(18) if status == "eof" then error("unexpected eof") end replies = replies + 1 end end) return s:send(packet) end
---
...
bug1160869()
@@ -917,14 +917,14 @@ bug1160869()
---
- 6
...
-wait_cout = 100 while replies ~= 3 and wait_cout > 0 do require('box.fiber').sleep(0.001) wait_cout = wait_cout - 1 end
+wait_cout = 100 while replies ~= 3 and wait_cout > 0 do require('fiber').sleep(0.001) wait_cout = wait_cout - 1 end
---
...
replies
---
- 3
...
- s = nil syncno = 0 reps = 0 packet = require('box.msgpack').encode({[0] = 64, [1] = 0}) packet = require('box.msgpack').encode(packet:len())..packet function iostart() if s ~= nil then return end s = boxsocket.tcp() s:connect('127.0.0.1', string.gsub(box.cfg.primary_port, '^.*:', '')) s:recv(128) require('box.fiber').wrap(function() while true do s:recv(18) if status == "eof" then error("unexpected eof") end reps = reps + 1 end end) end function iotest() iostart() syncno = syncno + 1 packet = require('box.msgpack').encode({[0] = 64, [1] = syncno}) packet = require('box.msgpack').encode(packet:len())..packet return s:send(packet) end
+ s = nil syncno = 0 reps = 0 packet = require('msgpack').encode({[0] = 64, [1] = 0}) packet = require('msgpack').encode(packet:len())..packet function iostart() if s ~= nil then return end s = socket.tcp() s:connect('127.0.0.1', string.gsub(box.cfg.primary_port, '^.*:', '')) s:recv(128) require('fiber').wrap(function() while true do s:recv(18) if status == "eof" then error("unexpected eof") end reps = reps + 1 end end) end function iotest() iostart() syncno = syncno + 1 packet = require('msgpack').encode({[0] = 64, [1] = syncno}) packet = require('msgpack').encode(packet:len())..packet return s:send(packet) end
---
...
iotest()
@@ -939,7 +939,7 @@ iotest()
---
- 6
...
-wait_cout = 100 while reps ~= 3 and wait_cout > 0 do require('box.fiber').sleep(0.001) wait_cout = wait_cout - 1 end
+wait_cout = 100 while reps ~= 3 and wait_cout > 0 do require('fiber').sleep(0.001) wait_cout = wait_cout - 1 end
---
...
reps
@@ -949,10 +949,10 @@ reps
test_listen_done = false
---
...
- function server() ms = boxsocket.tcp() ms:bind('127.0.0.1', 8181) ms:listen() test_listen_done = true while true do local s = ms:accept( .5 ) if s ~= 'timeout' then print("accepted connection ", s) s:send('Hello world') s:shutdown(boxsocket.SHUT_RDWR) end end end fbr = require('box.fiber').wrap(server)
+ function server() ms = socket.tcp() ms:bind('127.0.0.1', 8181) ms:listen() test_listen_done = true while true do local s = ms:accept( .5 ) if s ~= 'timeout' then print("accepted connection ", s) s:send('Hello world') s:shutdown(socket.SHUT_RDWR) end end end fbr = require('fiber').wrap(server)
---
...
-wait_cout = 100 while not test_listen_done and wait_cout > 0 do require('box.fiber').sleep(0.001) wait_cout = wait_cout - 1 end
+wait_cout = 100 while not test_listen_done and wait_cout > 0 do require('fiber').sleep(0.001) wait_cout = wait_cout - 1 end
---
...
Hello world
diff --git a/test/box/socket.test.py b/test/box/socket.test.py
index 272dc223663b7bc30b9c5df859783ff274671871..09605f622192769b0ba720680510f034f560daf1 100644
--- a/test/box/socket.test.py
+++ b/test/box/socket.test.py
@@ -4,15 +4,15 @@ import socket
########################
# #
-# box.socket.tcp/udp() #
+# socket.tcp/udp() #
# #
########################
-admin("boxsocket = require('box.socket')")
-admin("s = boxsocket.udp()")
+admin("socket = require('socket')")
+admin("s = socket.udp()")
admin("type(s)")
admin("s:close()")
-admin("s = boxsocket.tcp()")
+admin("s = socket.tcp()")
admin("type(s)")
### socket:close()
@@ -74,7 +74,7 @@ s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30303))
s.listen(1)
-admin("s = boxsocket.tcp()")
+admin("s = socket.tcp()")
admin("type(s:connect('127.0.0.1', '30303'))")
admin("s:send('ping')")
admin("s:error()")
@@ -468,7 +468,7 @@ s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind(('localhost', 30302))
# SOCK_DGRAM
-admin("s = boxsocket.udp()")
+admin("s = socket.udp()")
admin("type(s:sendto('ping', '127.0.0.1', '30302'))")
admin("s:error()")
@@ -486,7 +486,7 @@ admin("s:close()")
# connect from test to echo server implemented in
# stored procedure and do send/recv.
#
-admin("s = boxsocket.udp()")
+admin("s = socket.udp()")
admin("type(s:bind('127.0.0.1', '30301'))")
admin("s:error()")
@@ -512,13 +512,13 @@ admin("s:close()")
#
test="""
replies = 0
-packet = require('box.msgpack').encode({[0] = 64, [1] = 0})
-packet = require('box.msgpack').encode(packet:len())..packet
+packet = require('msgpack').encode({[0] = 64, [1] = 0})
+packet = require('msgpack').encode(packet:len())..packet
function bug1160869()
- local s = boxsocket.tcp()
+ local s = socket.tcp()
s:connect('127.0.0.1', string.gsub(box.cfg.primary_port, '^.*:', ''))
s:recv(128)
- require('box.fiber').wrap(function()
+ require('fiber').wrap(function()
while true do
_, status = s:recv(18)
if status == "eof" then
@@ -535,23 +535,23 @@ admin("bug1160869()")
admin("bug1160869()")
admin("bug1160869()")
# Due to delays in event loop the value can be not updated
-admin("wait_cout = 100 while replies ~= 3 and wait_cout > 0 do require('box.fiber').sleep(0.001) wait_cout = wait_cout - 1 end")
+admin("wait_cout = 100 while replies ~= 3 and wait_cout > 0 do require('fiber').sleep(0.001) wait_cout = wait_cout - 1 end")
admin("replies")
test="""
s = nil
syncno = 0
reps = 0
-packet = require('box.msgpack').encode({[0] = 64, [1] = 0})
-packet = require('box.msgpack').encode(packet:len())..packet
+packet = require('msgpack').encode({[0] = 64, [1] = 0})
+packet = require('msgpack').encode(packet:len())..packet
function iostart()
if s ~= nil then
return
end
- s = boxsocket.tcp()
+ s = socket.tcp()
s:connect('127.0.0.1', string.gsub(box.cfg.primary_port, '^.*:', ''))
s:recv(128)
- require('box.fiber').wrap(function()
+ require('fiber').wrap(function()
while true do
s:recv(18)
if status == "eof" then
@@ -565,8 +565,8 @@ end
function iotest()
iostart()
syncno = syncno + 1
- packet = require('box.msgpack').encode({[0] = 64, [1] = syncno})
- packet = require('box.msgpack').encode(packet:len())..packet
+ packet = require('msgpack').encode({[0] = 64, [1] = syncno})
+ packet = require('msgpack').encode(packet:len())..packet
return s:send(packet)
end
"""
@@ -575,7 +575,7 @@ admin("iotest()")
admin("iotest()")
admin("iotest()")
# Due to delays in event loop the value can be not updated
-admin("wait_cout = 100 while reps ~= 3 and wait_cout > 0 do require('box.fiber').sleep(0.001) wait_cout = wait_cout - 1 end")
+admin("wait_cout = 100 while reps ~= 3 and wait_cout > 0 do require('fiber').sleep(0.001) wait_cout = wait_cout - 1 end")
admin("reps")
# Bug #43: incorrect box:shutdown() arg handling
@@ -583,7 +583,7 @@ admin("reps")
#
test="""
function server()
- ms = boxsocket.tcp()
+ ms = socket.tcp()
ms:bind('127.0.0.1', 8181)
ms:listen()
test_listen_done = true
@@ -593,17 +593,17 @@ function server()
if s ~= 'timeout' then
print("accepted connection ", s)
s:send('Hello world')
- s:shutdown(boxsocket.SHUT_RDWR)
+ s:shutdown(socket.SHUT_RDWR)
end
end
end
-fbr = require('box.fiber').wrap(server)
+fbr = require('fiber').wrap(server)
"""
admin("test_listen_done = false")
admin(test.replace('\n', ' '))
# Due to delays in event loop the value can be not updated
-admin("wait_cout = 100 while not test_listen_done and wait_cout > 0 do require('box.fiber').sleep(0.001) wait_cout = wait_cout - 1 end")
+admin("wait_cout = 100 while not test_listen_done and wait_cout > 0 do require('fiber').sleep(0.001) wait_cout = wait_cout - 1 end")
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
diff --git a/test/box/tuple.result b/test/box/tuple.result
index d24922c901b62c6dda25997c5885919598ab402b..f0387de5fc6012b0005b8fcf499a13f0eb07836f 100644
--- a/test/box/tuple.result
+++ b/test/box/tuple.result
@@ -739,10 +739,10 @@ t:findall(-9223372036854775807LL)
--------------------------------------------------------------------------------
-- test msgpack.encode + tuple
--------------------------------------------------------------------------------
-msgpack = require('box.msgpack')
+msgpack = require('msgpack')
---
...
-msgpackffi = require('box.msgpackffi')
+msgpackffi = require('msgpackffi')
---
...
t = box.tuple.new({'a', 'b', 'c'})
diff --git a/test/box/tuple.test.lua b/test/box/tuple.test.lua
index eece3a56e74f9d1874d3f179b7207a9247e28283..0fc21d90fa25e84372a539d6953063ee22883a90 100644
--- a/test/box/tuple.test.lua
+++ b/test/box/tuple.test.lua
@@ -234,8 +234,8 @@ t:findall(-9223372036854775807LL)
-- test msgpack.encode + tuple
--------------------------------------------------------------------------------
-msgpack = require('box.msgpack')
-msgpackffi = require('box.msgpackffi')
+msgpack = require('msgpack')
+msgpackffi = require('msgpackffi')
t = box.tuple.new({'a', 'b', 'c'})
msgpack.decode(msgpackffi.encode(t))
diff --git a/test/box/uuid.result b/test/box/uuid.result
index 6a05fad4cc13f24510a7876920047f3769308310..7e12ebc149d177f59474796aa97619841801f63a 100644
--- a/test/box/uuid.result
+++ b/test/box/uuid.result
@@ -1,5 +1,5 @@
-- box.uuid
-uuid = require('box.uuid')
+uuid = require('uuid')
---
...
string.len(uuid.bin())
@@ -14,3 +14,6 @@ string.match(uuid.hex(), '^[a-f0-9]+$') ~= nil
---
- true
...
+uuid = nil
+---
+...
diff --git a/test/box/uuid.test.lua b/test/box/uuid.test.lua
index 440bfdc575e7f0268a06475242ba836cd4a26ebb..244e15c11dff566f780b98d07589ae305fe28372 100644
--- a/test/box/uuid.test.lua
+++ b/test/box/uuid.test.lua
@@ -1,5 +1,6 @@
-- box.uuid
-uuid = require('box.uuid')
+uuid = require('uuid')
string.len(uuid.bin())
string.len(uuid.hex())
string.match(uuid.hex(), '^[a-f0-9]+$') ~= nil
+uuid = nil
diff --git a/test/replication/hot_standby.result b/test/replication/hot_standby.result
index a3bb65aa510c07683485f05b4f33723e4118e5db..879307f873f575b5977efa682fbe813016655097 100644
--- a/test/replication/hot_standby.result
+++ b/test/replication/hot_standby.result
@@ -8,7 +8,7 @@ box.schema.user.grant('guest', 'read,write,execute', 'universe')
...
--# setopt delimiter ';'
--# set connection default, hot_standby, replica
-while box.space['_priv']:len() < 1 do require('box.fiber').sleep(0.01) end;
+while box.space['_priv']:len() < 1 do require('fiber').sleep(0.01) end;
---
...
do
@@ -46,7 +46,7 @@ do
function _wait_lsn(_lsnd)
while _get_pri_lsn() < _lsnd + begin_lsn do
- require('box.fiber').sleep(0.001)
+ require('fiber').sleep(0.001)
end
begin_lsn = begin_lsn + _lsnd
end
@@ -118,7 +118,7 @@ _select(1, 10)
- [10, 'the tuple 10']
...
--# stop server default
-require('box.fiber').sleep(0.2)
+require('fiber').sleep(0.2)
---
...
-- hot_standby.primary_port is garbage, since hot_standby.lua
diff --git a/test/replication/hot_standby.test.lua b/test/replication/hot_standby.test.lua
index 2ca49d1571844f3da2c45e99c9364b6d1bea9882..ae69b80c7f640105aaa95edb5968b0d098b4db92 100644
--- a/test/replication/hot_standby.test.lua
+++ b/test/replication/hot_standby.test.lua
@@ -7,7 +7,7 @@ box.schema.user.grant('guest', 'read,write,execute', 'universe')
--# setopt delimiter ';'
--# set connection default, hot_standby, replica
-while box.space['_priv']:len() < 1 do require('box.fiber').sleep(0.01) end;
+while box.space['_priv']:len() < 1 do require('fiber').sleep(0.01) end;
do
local pri_id = ''
local begin_lsn = 0
@@ -43,7 +43,7 @@ do
function _wait_lsn(_lsnd)
while _get_pri_lsn() < _lsnd + begin_lsn do
- require('box.fiber').sleep(0.001)
+ require('fiber').sleep(0.001)
end
begin_lsn = begin_lsn + _lsnd
end
@@ -68,7 +68,7 @@ _wait_lsn(10)
_select(1, 10)
--# stop server default
-require('box.fiber').sleep(0.2)
+require('fiber').sleep(0.2)
-- hot_standby.primary_port is garbage, since hot_standby.lua
-- uses MASTER_PORT environment variable for its primary_port
diff --git a/test/replication/swap.result b/test/replication/swap.result
index 82ce0c0f416db755232d4a70704f64fb2b1f8f50..c23ae7d6a624893b6fd69264112a2964848c0b18 100644
--- a/test/replication/swap.result
+++ b/test/replication/swap.result
@@ -1,7 +1,7 @@
box.schema.user.grant('guest', 'read,write,execute', 'universe')
---
...
-while box.space['_priv']:len() < 1 do require('box.fiber').sleep(0.01) end
+while box.space['_priv']:len() < 1 do require('fiber').sleep(0.01) end
---
...
s = box.schema.create_space('tweedledum', {id = 0})
diff --git a/test/replication/swap.test.py b/test/replication/swap.test.py
index 3456d903b67fd402a8e154209be07392273b3f8e..b63cb320b1f7ddf5432b5e0efc48315428bfe01f 100644
--- a/test/replication/swap.test.py
+++ b/test/replication/swap.test.py
@@ -24,7 +24,7 @@ replica.vardir = os.path.join(server.vardir, 'replica')
replica.deploy()
master.admin("box.schema.user.grant('guest', 'read,write,execute', 'universe')")
-replica.admin("while box.space['_priv']:len() < 1 do require('box.fiber').sleep(0.01) end")
+replica.admin("while box.space['_priv']:len() < 1 do require('fiber').sleep(0.01) end")
master.admin("s = box.schema.create_space('tweedledum', {id = 0})")
master.admin("s:create_index('primary', {type = 'hash'})")