Skip to content
Snippets Groups Projects
Commit 758b4a22 authored by Dmitry E. Oboukhov's avatar Dmitry E. Oboukhov
Browse files

Enable box.digest in stable, closes #297

+ fix bsdsocket test
parent 7885e3f2
No related branches found
No related tags found
No related merge requests found
......@@ -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
};
......
......@@ -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
......
......@@ -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()"
......
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment