From ce85de2e91305aed8295992182641b399998e0a1 Mon Sep 17 00:00:00 2001
From: Nick Zavaritsky <mejedi@gmail.com>
Date: Fri, 4 Sep 2015 23:22:59 +0300
Subject: [PATCH] Fix bsdsocket test (freebsd)
---
test/box/bsdsocket.result | 9 ++++++---
test/box/bsdsocket.test.lua | 5 +++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/test/box/bsdsocket.result b/test/box/bsdsocket.result
index 1e2f905354..763617fe2a 100644
--- a/test/box/bsdsocket.result
+++ b/test/box/bsdsocket.result
@@ -603,7 +603,7 @@ sc:nonblock(true)
---
- true
...
-sc:sysconnect('127.0.0.1', 3458) or errno() == errno.EINPROGRESS
+sc:sysconnect('127.0.0.1', 3458) or errno() == errno.EINPROGRESS or errno() == errno.ECONNREFUSED
---
- true
...
@@ -619,9 +619,12 @@ string.match(tostring(sc), ', peer') == nil
---
- true
...
-require('errno').strerror(sc:getsockopt('SOL_SOCKET', 'SO_ERROR'))
+socket_error = sc:getsockopt('SOL_SOCKET', 'SO_ERROR')
---
-- Connection refused
+...
+socket_error == errno.ECONNREFUSED or socket_error == 0
+---
+- true
...
--# setopt delimiter ';'
socket.getaddrinfo('127.0.0.1', '80', { type = 'SOCK_DGRAM',
diff --git a/test/box/bsdsocket.test.lua b/test/box/bsdsocket.test.lua
index 1a431295f0..0a8da452f2 100644
--- a/test/box/bsdsocket.test.lua
+++ b/test/box/bsdsocket.test.lua
@@ -201,11 +201,12 @@ sc = socket('PF_INET', 'SOCK_STREAM', 'tcp')
sc ~= nil
sc:getsockopt('SOL_SOCKET', 'SO_ERROR')
sc:nonblock(true)
-sc:sysconnect('127.0.0.1', 3458) or errno() == errno.EINPROGRESS
+sc:sysconnect('127.0.0.1', 3458) or errno() == errno.EINPROGRESS or errno() == errno.ECONNREFUSED
string.match(tostring(sc), ', peer') == nil
sc:writable()
string.match(tostring(sc), ', peer') == nil
-require('errno').strerror(sc:getsockopt('SOL_SOCKET', 'SO_ERROR'))
+socket_error = sc:getsockopt('SOL_SOCKET', 'SO_ERROR')
+socket_error == errno.ECONNREFUSED or socket_error == 0
--# setopt delimiter ';'
socket.getaddrinfo('127.0.0.1', '80', { type = 'SOCK_DGRAM',
--
GitLab