dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-12-26 12:28:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated to remove use of global methods. Conforming to

Browse Source 
LuaSocket release 1.2.1
This commit is contained in:
Diego Nehab 2001-03-06 20:16:17 +00:00
parent 22a5d3f669
commit bbb4b3e2c1
2 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
test/testclnt.lua
View File

@ -59,7 +59,7 @@ end
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
function reconnect() function reconnect()
if data then if data then
close(data) data:close()
send_command(CLOSE) send_command(CLOSE)
data = nil data = nil
end end
@ -105,9 +105,9 @@ function test_asciiline(len)
str10 = strrep("aZb.c#dAe?", floor(len/10)) str10 = strrep("aZb.c#dAe?", floor(len/10))
str = str .. str10 str = str .. str10
write("testing ", len, " byte(s) line\n") write("testing ", len, " byte(s) line\n")
err = send(data, str, "\n") err = data:send(str, "\n")
if err then fail(err) end if err then fail(err) end
back, err = receive(data) back, err = data:receive()
if err then fail(err) end if err then fail(err) end
if back == str then pass("lines match") if back == str then pass("lines match")
else fail("lines don't match") end else fail("lines don't match") end
@ -123,10 +123,10 @@ function test_closed()
reconnect() reconnect()
print("testing close while reading line") print("testing close while reading line")
send_command(ECHO_BLOCK, len) send_command(ECHO_BLOCK, len)
send(data, str) data:send(str)
send_command(CLOSE) send_command(CLOSE)
-- try to get a line -- try to get a line
back, err = receive(data) back, err = data:receive()
if not err then fail("shold have gotten 'closed'.") if not err then fail("shold have gotten 'closed'.")
elseif err ~= "closed" then fail("got '"..err.."' instead of 'closed'.") elseif err ~= "closed" then fail("got '"..err.."' instead of 'closed'.")
elseif str ~= back then fail("didn't receive what i should 'closed'.") elseif str ~= back then fail("didn't receive what i should 'closed'.")
@ -134,10 +134,10 @@ function test_closed()
reconnect() reconnect()
print("testing close while reading block") print("testing close while reading block")
send_command(ECHO_BLOCK, len) send_command(ECHO_BLOCK, len)
send(data, str) data:send(str)
send_command(CLOSE) send_command(CLOSE)
-- try to get a line -- try to get a line
back, err = receive(data, 2*len) back, err = data:receive(2*len)
if not err then fail("shold have gotten 'closed'.") if not err then fail("shold have gotten 'closed'.")
elseif err ~= "closed" then fail("got '"..err.."' instead of 'closed'.") elseif err ~= "closed" then fail("got '"..err.."' instead of 'closed'.")
elseif str ~= back then fail("didn't receive what I should.") elseif str ~= back then fail("didn't receive what I should.")
@ -157,9 +157,9 @@ function test_rawline(len)
str10 = strrep(strchar(120,21,77,4,5,0,7,36,44,100), floor(len/10)) str10 = strrep(strchar(120,21,77,4,5,0,7,36,44,100), floor(len/10))
str = str .. str10 str = str .. str10
write("testing ", len, " byte(s) line\n") write("testing ", len, " byte(s) line\n")
err = send(data, str, "\n") err = data:send(str, "\n")
if err then fail(err) end if err then fail(err) end
back, err = receive(data) back, err = data:receive()
if err then fail(err) end if err then fail(err) end
if back == str then pass("lines match") if back == str then pass("lines match")
else fail("lines don't match") end else fail("lines don't match") end
@ -177,12 +177,12 @@ function test_block(len)
send_command(ECHO_BLOCK, len) send_command(ECHO_BLOCK, len)
write("testing ", len, " byte(s) block\n") write("testing ", len, " byte(s) block\n")
s1 = strrep("x", half) s1 = strrep("x", half)
err = send(data, s1) err = data:send(s1)
if err then fail(err) end if err then fail(err) end
s2 = strrep("y", len-half) s2 = strrep("y", len-half)
err = send(data, s2) err = data:send(s2)
if err then fail(err) end if err then fail(err) end
back, err = receive(data, len) back, err = data:receive(len)
if err then fail(err) end if err then fail(err) end
if back == s1..s2 then pass("blocks match") if back == s1..s2 then pass("blocks match")
else fail("blocks don't match") end else fail("blocks don't match") end
@ -229,15 +229,15 @@ function test_blockedtimeout(len, t, s)
send_command(RECEIVE_BLOCK, len) send_command(RECEIVE_BLOCK, len)
write("testing ", len, " bytes, ", t, write("testing ", len, " bytes, ", t,
"s block timeout, ", s, "s sleep\n") "s block timeout, ", s, "s sleep\n")
timeout(data, t) data:timeout(t)
str = strrep("a", 2*len) str = strrep("a", 2*len)
err, total = send(data, str) err, total = data:send(str)
if blockedtimed_out(t, s, err, "send") then return end if blockedtimed_out(t, s, err, "send") then return end
if err then fail(err) end if err then fail(err) end
send_command(SEND_BLOCK) send_command(SEND_BLOCK)
send_command(SLEEP, s) send_command(SLEEP, s)
send_command(SEND_BLOCK) send_command(SEND_BLOCK)
back, err = receive(data, 2*len) back, err = data:receive(2*len)
if blockedtimed_out(t, s, err, "receive") then return end if blockedtimed_out(t, s, err, "receive") then return end
if err then fail(err) end if err then fail(err) end
if back == str then pass("blocks match") if back == str then pass("blocks match")
@ -278,16 +278,16 @@ function test_returntimeout(len, t, s)
send_command(RECEIVE_BLOCK, len) send_command(RECEIVE_BLOCK, len)
write("testing ", len, " bytes, ", t, write("testing ", len, " bytes, ", t,
"s return timeout, ", s, "s sleep\n") "s return timeout, ", s, "s sleep\n")
timeout(data, t, "return") data:timeout(t, "return")
str = strrep("a", 2*len) str = strrep("a", 2*len)
err, total, delta = send(data, str) err, total, delta = data:send(str)
print("sent in " .. delta .. "s") print("sent in " .. delta .. "s")
if returntimed_out(delta, t, err) then return end if returntimed_out(delta, t, err) then return end
if err then fail("unexpected error: " .. err) end if err then fail("unexpected error: " .. err) end
send_command(SEND_BLOCK) send_command(SEND_BLOCK)
send_command(SLEEP, s) send_command(SLEEP, s)
send_command(SEND_BLOCK) send_command(SEND_BLOCK)
back, err, delta = receive(data, 2*len) back, err, delta = data:receive(2*len)
print("received in " .. delta .. "s") print("received in " .. delta .. "s")
if returntimed_out(delta, t, err) then return end if returntimed_out(delta, t, err) then return end
if err then fail("unexpected error: " .. err) end if err then fail("unexpected error: " .. err) end
@ -308,37 +308,37 @@ function test_patterns()
block = block .. unix_line1 .. "\n" .. unix_line2 .. "\n" block = block .. unix_line1 .. "\n" .. unix_line2 .. "\n"
block = block .. block block = block .. block
send_command(ECHO_BLOCK, strlen(block)) send_command(ECHO_BLOCK, strlen(block))
err = send(data, block) err = data:send(block)
if err then fail(err) end if err then fail(err) end
local back = receive(data, "*l") local back = data:receive("*l")
if back ~= dos_line1 then fail("'*l' failed") end if back ~= dos_line1 then fail("'*l' failed") end
back = receive(data, "*l") back = data:receive("*l")
if back ~= dos_line2 then fail("'*l' failed") end if back ~= dos_line2 then fail("'*l' failed") end
back = receive(data, "*lu") back = data:receive("*lu")
if back ~= unix_line1 then fail("'*lu' failed") end if back ~= unix_line1 then fail("'*lu' failed") end
back = receive(data, "*lu") back = data:receive("*lu")
if back ~= unix_line2 then fail("'*lu' failed") end if back ~= unix_line2 then fail("'*lu' failed") end
back = receive(data) back = data:receive()
if back ~= dos_line1 then fail("default failed") end if back ~= dos_line1 then fail("default failed") end
back = receive(data) back = data:receive()
if back ~= dos_line2 then fail("default failed") end if back ~= dos_line2 then fail("default failed") end
back = receive(data, "*lu") back = data:receive("*lu")
if back ~= unix_line1 then fail("'*lu' failed") end if back ~= unix_line1 then fail("'*lu' failed") end
back = receive(data, "*lu") back = data:receive("*lu")
if back ~= unix_line2 then fail("'*lu' failed") end if back ~= unix_line2 then fail("'*lu' failed") end
pass("line patterns are ok") pass("line patterns are ok")
send_command(ECHO_BLOCK, strlen(block)) send_command(ECHO_BLOCK, strlen(block))
err = send(data, block) err = data:send(block)
if err then fail(err) end if err then fail(err) end
back = receive(data, strlen(block)) back = data:receive(strlen(block))
if back ~= block then fail("number failed") end if back ~= block then fail("number failed") end
pass("number is ok") pass("number is ok")
send_command(ECHO_BLOCK, strlen(block)) send_command(ECHO_BLOCK, strlen(block))
send_command(SLEEP, 1) send_command(SLEEP, 1)
send_command(CLOSE) send_command(CLOSE)
err = send(data, block) err = data:send(block)
if err then fail(err) end if err then fail(err) end
back = receive(data, "*a") back = data:receive("*a")
if back ~= block then fail("'*a' failed") end if back ~= block then fail("'*a' failed") end
pass("'*a' is ok") pass("'*a' is ok")
end end
@ -390,7 +390,7 @@ test_block(800000)
new_test("non-blocking transfer test") new_test("non-blocking transfer test")
-- the value is not important, we only want -- the value is not important, we only want
-- to test non-blockin I/O anyways -- to test non-blockin I/O anyways
timeout(data, 200) data:timeout(200)
test_block(1) test_block(1)
test_block(17) test_block(17)
test_block(200) test_block(200)
@ -421,7 +421,7 @@ test_returntimeout(800000, 2, 1)
print("client: closing connection with server") print("client: closing connection with server")
send_command(CLOSE) send_command(CLOSE)
send_command(EXIT) send_command(EXIT)
close(control) control:close()
new_test("the library has passed all tests") new_test("the library has passed all tests")
print(format("time elapsed: %6.2fs", time() - start)) print(format("time elapsed: %6.2fs", time() - start))

22
test/testsrvr.lua
View File

@ -30,7 +30,7 @@ if not server then
exit(1) exit(1)
end end
print("server: waiting for control connection...") print("server: waiting for control connection...")
control = accept(server) control = server:accept()
print("server: control connection stablished!") print("server: control connection stablished!")
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
@ -42,7 +42,7 @@ print("server: control connection stablished!")
function execute_command(cmd, par) function execute_command(cmd, par)
if cmd == CONNECT then if cmd == CONNECT then
print("server: waiting for data connection...") print("server: waiting for data connection...")
data = accept(server) data = server:accept()
if not data then if not data then
fail("server: unable to start data connection!") fail("server: unable to start data connection!")
else else
@ -51,31 +51,31 @@ function execute_command(cmd, par)
elseif cmd == CLOSE then elseif cmd == CLOSE then
print("server: closing connection with client...") print("server: closing connection with client...")
if data then if data then
close(data) data:close()
data = nil data = nil
end end
elseif cmd == ECHO_LINE then elseif cmd == ECHO_LINE then
str, err = receive(data) str, err = data:receive()
if err then fail("server: " .. err) end if err then fail("server: " .. err) end
err = send(data, str, "\n") err = data:send(str, "\n")
if err then fail("server: " .. err) end if err then fail("server: " .. err) end
elseif cmd == ECHO_BLOCK then elseif cmd == ECHO_BLOCK then
str, err = receive(data, par) str, err = data:receive(par)
print(format("server: received %d bytes", strlen(str))) print(format("server: received %d bytes", strlen(str)))
if err then fail("server: " .. err) end if err then fail("server: " .. err) end
print(format("server: sending %d bytes", strlen(str))) print(format("server: sending %d bytes", strlen(str)))
err = send(data, str) err = data:send(str)
if err then fail("server: " .. err) end if err then fail("server: " .. err) end
elseif cmd == RECEIVE_BLOCK then elseif cmd == RECEIVE_BLOCK then
str, err = receive(data, par) str, err = data:receive(par)
print(format("server: received %d bytes", strlen(str))) print(format("server: received %d bytes", strlen(str)))
elseif cmd == SEND_BLOCK then elseif cmd == SEND_BLOCK then
print(format("server: sending %d bytes", strlen(str))) print(format("server: sending %d bytes", strlen(str)))
err = send(data, str) err = data:send(str)
elseif cmd == ECHO_TIMEOUT then elseif cmd == ECHO_TIMEOUT then
str, err = receive(data, par) str, err = data:receive(par)
if err then fail("server: " .. err) end if err then fail("server: " .. err) end
err = send(data, str) err = data:send(str)
if err then fail("server: " .. err) end if err then fail("server: " .. err) end
elseif cmd == COMMAND then elseif cmd == COMMAND then
cmd, par = get_command() cmd, par = get_command()