From 9f0f538434f74faa2983d331314405741b0f0c91 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Mon, 23 May 2016 05:59:58 +0300
Subject: [PATCH] Fix socket.test to work without Internet connection
Failed in a plane.
---
test/app/socket.result | 35 +----------------------------------
test/app/socket.test.lua | 11 +----------
2 files changed, 2 insertions(+), 44 deletions(-)
diff --git a/test/app/socket.result b/test/app/socket.result
index 8bdf8dbeef..ea7a21f3a5 100644
--- a/test/app/socket.result
+++ b/test/app/socket.result
@@ -658,10 +658,6 @@ test_run:cmd("setopt delimiter ''");
---
- true
...
-#(socket.getaddrinfo('tarantool.org', 'http', {})) > 0
----
-- true
-...
wrong_addr = socket.getaddrinfo('non-existing-domain-name-12211alklkl.com', 'http', {})
---
...
@@ -879,36 +875,7 @@ sc:close()
- true
...
-- tcp_connect
-s = socket.tcp_connect('tarantool.org', 80)
----
-...
-string.match(tostring(s), ', aka') ~= nil
----
-- true
-...
-string.match(tostring(s), ', peer') ~= nil
----
-- true
-...
-s:write("HEAD / HTTP/1.0\r\nHost: tarantool.org\r\n\r\n")
----
-- 40
-...
-header = s:read({chunk = 4000, delimiter = {"\n\n", "\r\n\r\n" }}, 1)
----
-...
-string.match(header, "\r\n\r\n$") ~= nil
----
-- true
-...
-string.match(header, "200 [Oo][Kk]") ~= nil
----
-- true
-...
-s:close()
----
-- true
-...
+-- test timeout
socket.tcp_connect('127.0.0.1', 80, 0.00000000001)
---
- null
diff --git a/test/app/socket.test.lua b/test/app/socket.test.lua
index 259c9ad563..b9e93c5858 100644
--- a/test/app/socket.test.lua
+++ b/test/app/socket.test.lua
@@ -213,7 +213,6 @@ aexitst( socket.getaddrinfo('localhost', 'http', { protocol = 'tcp',
type = 'SOCK_STREAM'}), {'127.0.0.1', '::1'}, 80 );
test_run:cmd("setopt delimiter ''");
-#(socket.getaddrinfo('tarantool.org', 'http', {})) > 0
wrong_addr = socket.getaddrinfo('non-existing-domain-name-12211alklkl.com', 'http', {})
wrong_addr == nil or #wrong_addr == 0
@@ -280,15 +279,7 @@ sc:close()
-- tcp_connect
-s = socket.tcp_connect('tarantool.org', 80)
-string.match(tostring(s), ', aka') ~= nil
-string.match(tostring(s), ', peer') ~= nil
-s:write("HEAD / HTTP/1.0\r\nHost: tarantool.org\r\n\r\n")
-header = s:read({chunk = 4000, delimiter = {"\n\n", "\r\n\r\n" }}, 1)
-string.match(header, "\r\n\r\n$") ~= nil
-string.match(header, "200 [Oo][Kk]") ~= nil
-s:close()
-
+-- test timeout
socket.tcp_connect('127.0.0.1', 80, 0.00000000001)
-- AF_INET
--
GitLab