From 952d8d1d4ffe81a0be4d7901f063f6c5059d71f5 Mon Sep 17 00:00:00 2001
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Wed, 14 Aug 2019 08:11:19 +0300
Subject: [PATCH] test: app/socket flaky fails at 1118 line
Found that on high loaded hosts the test flaky fails at:
[004] --- app/socket.result Mon Jul 15 07:18:57 2019
[004] +++ app/socket.reject Tue Jul 16 16:37:35 2019
[004] @@ -1118,7 +1118,7 @@
[004] ...
[004] ch:get(1)
[004] ---
[004] -- true
[004] +- null
[004] ...
[004] s:error()
[004] ---
Found that the test in previous was used for testing the
the channel get() function timeout and the error occurred
on it, but later the checking error changed to:
"builtin/socket.lua: attempt to use closed socket" and the
test became not correct. Because for now it passes when the
socket read function runs before the socket closing, but in
this way read call doesn't wait. In the other way on high
loaded hosts the close call may occure before read call and
in this way read call halts and socket get call returns
'null'. As seen both ways are not correct to check the error.
Decided to remove this subtest.
Check commit ba7a4fee73 ("Add tests for socket:close closes #360")
Fixes #4354
---
test/app/socket.result | 58 ----------------------------------------
test/app/socket.test.lua | 24 -----------------
2 files changed, 82 deletions(-)
diff --git a/test/app/socket.result b/test/app/socket.result
index 77eff7370a..fd299424c9 100644
--- a/test/app/socket.result
+++ b/test/app/socket.result
@@ -1066,64 +1066,6 @@ tostring(s)
s = nil
---
...
--- close
-serv = socket('AF_INET', 'SOCK_STREAM', 'tcp')
----
-...
-serv:setsockopt('SOL_SOCKET', 'SO_REUSEADDR', true)
----
-- true
-...
-serv:bind('127.0.0.1', port)
----
-- true
-...
-port = serv:name().port
----
-...
-serv:listen()
----
-- true
-...
-test_run:cmd("setopt delimiter ';'")
----
-- true
-...
-f = fiber.create(function(serv)
- serv:readable()
- sc = serv:accept()
- sc:write("Tarantool test server")
- sc:shutdown()
- sc:close()
- serv:close()
-end, serv);
----
-...
-test_run:cmd("setopt delimiter ''");
----
-- true
-...
-s = socket.tcp_connect('127.0.0.1', port)
----
-...
-ch = fiber.channel()
----
-...
-f = fiber.create(function() s:read(12) ch:put(true) end)
----
-...
-s:close()
----
-- true
-...
-ch:get(1)
----
-- true
-...
-s:error()
----
-- error: 'builtin/socket.lua: attempt to use closed socket'
-...
-- random port
master = socket('PF_INET', 'SOCK_STREAM', 'tcp')
---
diff --git a/test/app/socket.test.lua b/test/app/socket.test.lua
index 7ae9a98aac..c72d41763f 100644
--- a/test/app/socket.test.lua
+++ b/test/app/socket.test.lua
@@ -340,30 +340,6 @@ s._gc_socket = nil
tostring(s)
s = nil
--- close
-serv = socket('AF_INET', 'SOCK_STREAM', 'tcp')
-serv:setsockopt('SOL_SOCKET', 'SO_REUSEADDR', true)
-serv:bind('127.0.0.1', port)
-port = serv:name().port
-serv:listen()
-test_run:cmd("setopt delimiter ';'")
-f = fiber.create(function(serv)
- serv:readable()
- sc = serv:accept()
- sc:write("Tarantool test server")
- sc:shutdown()
- sc:close()
- serv:close()
-end, serv);
-test_run:cmd("setopt delimiter ''");
-
-s = socket.tcp_connect('127.0.0.1', port)
-ch = fiber.channel()
-f = fiber.create(function() s:read(12) ch:put(true) end)
-s:close()
-ch:get(1)
-s:error()
-
-- random port
master = socket('PF_INET', 'SOCK_STREAM', 'tcp')
master:setsockopt('SOL_SOCKET', 'SO_REUSEADDR', true)
--
GitLab