From 758b4a2286fab1c4a4d352a51e6312ca6d51f485 Mon Sep 17 00:00:00 2001
From: "Dmitry E. Oboukhov" <unera@debian.org>
Date: Tue, 20 May 2014 17:36:07 +0400
Subject: [PATCH] Enable box.digest in stable, closes #297
+ fix bsdsocket test
---
src/lua/init.cc | 2 ++
test/box/bsdsocket.result | 12 ++++--------
test/box/bsdsocket.test | 5 ++---
test/box/lua.result | 1 +
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/lua/init.cc b/src/lua/init.cc
index 397aceecd6..5b77b00b6d 100644
--- a/src/lua/init.cc
+++ b/src/lua/init.cc
@@ -78,9 +78,11 @@ struct lua_State *tarantool_L;
/* contents of src/lua/ files */
extern char uuid_lua[];
extern char session_lua[];
+extern char digest_lua[];
static const char *lua_sources[] = {
uuid_lua,
session_lua,
+ digest_lua,
NULL
};
diff --git a/test/box/bsdsocket.result b/test/box/bsdsocket.result
index b98cc755d0..1645648820 100644
--- a/test/box/bsdsocket.result
+++ b/test/box/bsdsocket.result
@@ -18,9 +18,9 @@ lua type(s)
---
- table
...
-lua s
+lua string.match(tostring(s), 'fd %d+, aka 0%.0%.0%.0:0') ~= nil
---
- - fd 10, aka 0.0.0.0:0
+ - true
...
lua s:errno()
---
@@ -455,9 +455,9 @@ lua s:bind('unix/', '/tmp/tarantool-test-socket')
---
- true
...
-lua tostring(sc)
+lua string.match(tostring(sc), 'fd %d+, aka unix/:/tmp/tarantool%-test%-socket') ~= nil
---
- - fd 12, aka unix/:/tmp/tarantool-test-socket
+ - true
...
lua s:listen(1234)
---
@@ -527,10 +527,6 @@ lua #(box.socket.getaddrinfo('mail12211alklkl.ru', 'http', {})) == 0
lua sc = box.socket('PF_INET', 'SOCK_STREAM', 'tcp')
---
...
-lua tostring(sc)
----
- - fd 12, aka 0.0.0.0:0
-...
lua sc:getsockopt('SOL_SOCKET', 'SO_ERROR')
---
- 0
diff --git a/test/box/bsdsocket.test b/test/box/bsdsocket.test
index 3c501d8d77..8b69dbbc5a 100644
--- a/test/box/bsdsocket.test
+++ b/test/box/bsdsocket.test
@@ -10,7 +10,7 @@ exec admin "lua box.socket('PF_INET', 'SOCK_STREAM', 'tcp121222'); return box.er
exec admin "lua s = box.socket('PF_INET', 'SOCK_STREAM', 'tcp')"
exec admin "lua s:wait(.01)"
exec admin "lua type(s)"
-exec admin "lua s"
+exec admin "lua string.match(tostring(s), 'fd %d+, aka 0%.0%.0%.0:0') ~= nil"
exec admin "lua s:errno()"
exec admin "lua type(s:error())"
@@ -138,7 +138,7 @@ exec admin "lua s:nonblock()"
if os.path.exists('/tmp/tarantool-test-socket'):
os.unlink('/tmp/tarantool-test-socket')
exec admin "lua s:bind('unix/', '/tmp/tarantool-test-socket')"
-exec admin "lua tostring(sc)"
+exec admin "lua string.match(tostring(sc), 'fd %d+, aka unix/:/tmp/tarantool%-test%-socket') ~= nil"
exec admin "lua s:listen(1234)"
exec admin "lua sc = box.socket('PF_UNIX', 'SOCK_STREAM', 'ip')"
@@ -166,7 +166,6 @@ exec admin "lua #(box.socket.getaddrinfo('mail.ru', 'http', {})) > 0"
exec admin "lua #(box.socket.getaddrinfo('mail12211alklkl.ru', 'http', {})) == 0"
exec admin "lua sc = box.socket('PF_INET', 'SOCK_STREAM', 'tcp')"
-exec admin "lua tostring(sc)"
exec admin "lua sc:getsockopt('SOL_SOCKET', 'SO_ERROR')"
exec admin "lua sc:nonblock(true)"
exec admin "lua sc:readable()"
diff --git a/test/box/lua.result b/test/box/lua.result
index 20023179ec..e6a6b1b9de 100644
--- a/test/box/lua.result
+++ b/test/box/lua.result
@@ -21,6 +21,7 @@ lua local t = {} for n in pairs(box) do table.insert(t, ' - box.' .. tostring(n
- box.delete
- box.digest
- box.dostring
+ - box.errno
- box.error
- box.fiber
- box.flags
--
GitLab