From ba7a4fee73f249a77c23ac9cf8c928cc8d0912a9 Mon Sep 17 00:00:00 2001
From: "Dmitry E. Oboukhov" <unera@debian.org>
Date: Wed, 25 Jun 2014 16:04:44 +0400
Subject: [PATCH] Add tests for socket:close closes #360
---
test/box/bsdsocket.result | 46 +++++++++++++++++++++++++++++--------
test/box/bsdsocket.test.lua | 22 +++++++++---------
2 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/test/box/bsdsocket.result b/test/box/bsdsocket.result
index ef3e1c126e..5a93269d22 100644
--- a/test/box/bsdsocket.result
+++ b/test/box/bsdsocket.result
@@ -814,13 +814,39 @@ string.sub(s:read(128), 1, 9)
---
- Tarantool
...
--- sa = { fh = 512 } setmetatable(sa, getmetatable(s))
--- tostring(sa)
--- sa:readable(0)
--- sa:writable(0)
--- ch = fiber.channel()
--- f = fiber.wrap(function() s:read(12) ch:put(true) end)
--- fiber.sleep(.1)
--- s:close()
--- ch:get(1)
--- s:error()
+sa = { fh = 512 } setmetatable(sa, getmetatable(s))
+---
+...
+tostring(sa)
+---
+- fd 512
+...
+sa:readable(0)
+---
+- true
+...
+sa:writable(0)
+---
+- true
+...
+ch = fiber.channel()
+---
+...
+f = fiber.wrap(function() s:read(12) ch:put(true) end)
+---
+...
+fiber.sleep(.1)
+---
+...
+s:close()
+---
+- true
+...
+ch:get(1)
+---
+- true
+...
+s:error()
+---
+- Connection timed out
+...
diff --git a/test/box/bsdsocket.test.lua b/test/box/bsdsocket.test.lua
index 2afce04573..ba0155af47 100644
--- a/test/box/bsdsocket.test.lua
+++ b/test/box/bsdsocket.test.lua
@@ -260,14 +260,14 @@ socket.tcp_connect('127.0.0.1', 80, 0.00000000001)
s = socket.tcp_connect('127.0.0.1', primary_port)
string.sub(s:read(128), 1, 9)
--- sa = { fh = 512 } setmetatable(sa, getmetatable(s))
--- tostring(sa)
--- sa:readable(0)
--- sa:writable(0)
-
--- ch = fiber.channel()
--- f = fiber.wrap(function() s:read(12) ch:put(true) end)
--- fiber.sleep(.1)
--- s:close()
--- ch:get(1)
--- s:error()
+sa = { fh = 512 } setmetatable(sa, getmetatable(s))
+tostring(sa)
+sa:readable(0)
+sa:writable(0)
+
+ch = fiber.channel()
+f = fiber.wrap(function() s:read(12) ch:put(true) end)
+fiber.sleep(.1)
+s:close()
+ch:get(1)
+s:error()
--
GitLab