Fix #640: box/bsdsocket.test.lua spountanously fails

src/lua/bsdsocket.lua

@@ -958,11 +958,7 @@ local function tcp_connect(host, port, timeout)
     local stop = box.time() + timeout
     local dns = getaddrinfo(host, port, timeout, { type = 'SOCK_STREAM',
         protocol = 'tcp' })
-    if dns == nil then
-        return nil
-    end
-
-    if #dns == 0 then
+    if dns == nil or #dns == 0 then
         box.errno(box.errno.EINVAL)
         return nil
     end
@@ -977,6 +973,7 @@ local function tcp_connect(host, port, timeout)
             return s
         end
     end
+    -- errno is set by tcp_connect_remote()
     return nil
 end
 

test/box/bsdsocket.result

@@ -1251,6 +1251,10 @@ lua s:close()
 ---
  - true
 ...
+lua box.cjson.encode{ box.socket.tcp_connect('invalid domain name') == nil, box.errno.strerror() }
+---
+ - [true,"Invalid argument"]
+...
 lua box.cjson.encode{ box.socket.tcp_connect('test:test@localhost:3303') == nil, box.errno.strerror() }
 ---
  - [true,"Invalid argument"]

test/box/bsdsocket.test

@@ -408,7 +408,7 @@ exec admin "lua s:close()"
 if os.path.exists(path):
     print 'unix socket was not removed: test failed'
 
-
+exec admin "lua box.cjson.encode{ box.socket.tcp_connect('invalid domain name') == nil, box.errno.strerror() }"
 exec admin "lua box.cjson.encode{ box.socket.tcp_connect('test:test@localhost:3303') == nil, box.errno.strerror() }"