diff --git a/src/lua/fiber.cc b/src/lua/fiber.cc index 73f1ca7e7944e608ff2d83bd6c700991b75331f0..7984457d58a532889433541d08d5a071d9e25419 100644 --- a/src/lua/fiber.cc +++ b/src/lua/fiber.cc @@ -772,6 +772,8 @@ lbox_fiber_testcancel(struct lua_State *L) static const struct luaL_reg lbox_fiber_meta [] = { {"id", lbox_fiber_id}, {"name", lbox_fiber_name}, + {"cancel", lbox_fiber_cancel}, + {"resume", lbox_fiber_resume}, {"__gc", lbox_fiber_gc}, {NULL, NULL} }; diff --git a/test/box/fiber.result b/test/box/fiber.result index d6bb185c0d380bc97c9c5b6b47732ded120542cb..12b60d4c5b5cee585a952de734f622a3968412ba 100644 --- a/test/box/fiber.result +++ b/test/box/fiber.result @@ -811,3 +811,26 @@ box_fiber_run_test() - 'B: odd 5' - 'status: dead' ... +function testfun() while true do box.fiber.sleep(10) end end +--- +... +f = box.fiber.wrap(testfun) +--- +... +f:cancel() +--- +... +f:resume() +--- +- error: 'fiber.resume(): the fiber is dead' +... +fib_id = box.fiber.wrap(testfun):id() +--- +... +box.fiber.find(fib_id):cancel() +--- +... +box.fiber.find(fib_id) +--- +- null +... diff --git a/test/box/fiber.test.lua b/test/box/fiber.test.lua index 22652bb304dff8c73b1ec7bacee3591983933b91..094fbb434c769de7e145351291b58c7ca6fd2c88 100644 --- a/test/box/fiber.test.lua +++ b/test/box/fiber.test.lua @@ -273,3 +273,11 @@ space:drop() 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) +f:cancel() +f:resume() +fib_id = box.fiber.wrap(testfun):id() +box.fiber.find(fib_id):cancel() +box.fiber.find(fib_id) diff --git a/test/module/net_sql.mysql.result b/test/module/net_sql.mysql.result index edd89868284bfd2c0083c8179451840f567d244b..c19dd46de6b6c07ad995d35f69d81c217227092b 100644 --- a/test/module/net_sql.mysql.result +++ b/test/module/net_sql.mysql.result @@ -27,6 +27,11 @@ c = box.net.sql.connect('abcd') --- - error: '../../src/module/sql/sql.lua:29: Unknown driver ''abcd''' ... +c = box.net.sql.connect('mysql') +--- +- error: '../../src/module/sql/sql.lua:64: Usage: box.net.sql.connect(''mysql'', host, + port, user, password, db, ...)' +... function dump(v) return box.cjson.encode(v) end --- ... diff --git a/test/module/net_sql.mysql.test.lua b/test/module/net_sql.mysql.test.lua index d33ff1b300dacb19b2ebd367d34f76fc48746585..9b5539575c831c7dd82457785dd60996f7873eed 100644 --- a/test/module/net_sql.mysql.test.lua +++ b/test/module/net_sql.mysql.test.lua @@ -10,6 +10,7 @@ os.execute("cp ../../src/module/mysql/mysql.so box/net/") require("box.net.mysql") c = box.net.sql.connect('abcd') +c = box.net.sql.connect('mysql') function dump(v) return box.cjson.encode(v) end connect = {}