From d6ca8fa2277f8426e534d43bba28e1ff8f9874d3 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Mon, 18 Aug 2014 15:20:30 +0400
Subject: [PATCH] gh-445: update test results
Clear errno for UNIX socket connections as well.
---
src/lua/bsdsocket.lua | 1 +
test/box/bsdsocket.result | 12 ++++++------
test/box/bsdsocket.test.lua | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/lua/bsdsocket.lua b/src/lua/bsdsocket.lua
index 6b660b5a58..c074fe063e 100644
--- a/src/lua/bsdsocket.lua
+++ b/src/lua/bsdsocket.lua
@@ -878,6 +878,7 @@ local function tcp_connect_remote(remote, timeout)
-- Even through the socket is nonblocking, if the server to which we
-- are connecting is on the same host, the connect is normally
-- established immediately when we call connect (Stevens UNP).
+ boxerrno(0)
return s
end
local save_errno = s:errno()
diff --git a/test/box/bsdsocket.result b/test/box/bsdsocket.result
index 64f946eae2..419e84a621 100644
--- a/test/box/bsdsocket.result
+++ b/test/box/bsdsocket.result
@@ -464,7 +464,7 @@ sc:close()
---
- true
...
-s = socket('PF_UNIX', 'SOCK_STREAM', 'ip')
+s = socket('PF_UNIX', 'SOCK_STREAM', 0)
---
...
s:setsockopt('SOL_SOCKET', 'SO_REUSEADDR', true)
@@ -505,7 +505,7 @@ s:listen(1234)
---
- true
...
-sc = socket('PF_UNIX', 'SOCK_STREAM', 'ip')
+sc = socket('PF_UNIX', 'SOCK_STREAM', 0)
---
...
sc:nonblock(true)
@@ -857,7 +857,7 @@ socket.tcp_connect('127.0.0.1', porrt), errno() == errno.ECONNREFUSED
path = '/tmp/tarantool-test-socket'
---
...
-s = socket('AF_UNIX', 'SOCK_STREAM', 'ip')
+s = socket('AF_UNIX', 'SOCK_STREAM', 0)
---
...
s:bind('unix/', path)
@@ -880,9 +880,9 @@ sc ~= nil
---
- true
...
-e == 0
+e
---
-- true
+- 0
...
sc:close()
---
@@ -1025,7 +1025,7 @@ f = nil
path = '/tmp/tarantool-test-socket'
---
...
-s = socket('PF_UNIX', 'SOCK_STREAM', 'ip')
+s = socket('PF_UNIX', 'SOCK_STREAM', 0)
---
...
s:setsockopt('SOL_SOCKET', 'SO_REUSEADDR', true)
diff --git a/test/box/bsdsocket.test.lua b/test/box/bsdsocket.test.lua
index 5bd72354b5..ef953214eb 100644
--- a/test/box/bsdsocket.test.lua
+++ b/test/box/bsdsocket.test.lua
@@ -278,7 +278,7 @@ socket.tcp_connect('unix/', path), errno() == errno.ECONNREFUSED
s:listen()
sc, e = socket.tcp_connect('unix/', path), errno()
sc ~= nil
-e == 0
+e
sc:close()
s:close()
socket.tcp_connect('unix/', path), errno() == errno.ECONNREFUSED
--
GitLab