diff --git a/test/box/socket.result b/test/box/socket.result index f4baf74ec63c8adac4b3d5d895bffc19d4032510..42c512366fb3757b056fca6d59c378f7d61aff89 100644 --- a/test/box/socket.result +++ b/test/box/socket.result @@ -899,32 +899,27 @@ ping s:close() --- ... - replies = 0 packet = msgpack.encode({[0] = 0, [1] = 0}) packet = msgpack.encode(packet:len())..packet function bug1160869() local s = box.socket.tcp() s:connect('127.0.0.1', box.cfg.primary_port) box.fiber.resume( box.fiber.create(function() box.fiber.detach() while true do _, status = s:recv(18) if status == "eof" then error("unexpected eof") end replies = replies + 1 end end) ) return s:send(packet)) end + replies = 0 packet = msgpack.encode({[0] = 0, [1] = 0}) packet = msgpack.encode(packet:len())..packet function bug1160869() local s = box.socket.tcp() s:connect('127.0.0.1', box.cfg.primary_port) box.fiber.resume( box.fiber.create(function() box.fiber.detach() while true do _, status = s:recv(18) if status == "eof" then error("unexpected eof") end replies = replies + 1 end end) ) return s:send(packet) end --- -- error: '[string " replies = 0 packet = msgpack.encode({[0] = 0..."]:1: ''end'' expected - near '')''' ... bug1160869() --- -- error: '[string "return bug1160869()"]:1: attempt to call global ''bug1160869'' - (a nil value)' +- 6 ... bug1160869() --- -- error: '[string "return bug1160869()"]:1: attempt to call global ''bug1160869'' - (a nil value)' +- 6 ... bug1160869() --- -- error: '[string "return bug1160869()"]:1: attempt to call global ''bug1160869'' - (a nil value)' +- 6 ... wait_cout = 100 while replies ~= 3 and wait_cout > 0 do box.fiber.sleep(0.001) wait_cout = wait_cout - 1 end --- ... replies --- -- null +- 3 ... s = nil syncno = 0 reps = 0 packet = msgpack.encode({[0] = 0, [1] = 0}) packet = msgpack.encode(packet:len())..packet function iostart() if s ~= nil then return end s = box.socket.tcp() s:connect('127.0.0.1', box.cfg.primary_port) box.fiber.resume( box.fiber.create(function() box.fiber.detach() while true do s:recv(18) if status == "eof" then error("unexpected eof") end reps = reps + 1 end end)) end function iotest() iostart() syncno = syncno + 1 packet = msgpack.encode({[0] = 0, [1] = syncno}) packet = msgpack.encode(packet:len())..packet return s:send(packet) end --- diff --git a/test/box/socket.test.py b/test/box/socket.test.py index 15f4be6fb4a3f4c18d9bbac75eb58f9d55c25630..cee89ad906f0207379fbfc45136d4bcdcc3dff12 100644 --- a/test/box/socket.test.py +++ b/test/box/socket.test.py @@ -526,7 +526,7 @@ function bug1160869() replies = replies + 1 end end) ) - return s:send(packet)) + return s:send(packet) end """ admin(test.replace('\n', ' '))