1 files changed, 7 insertions, 9 deletions

diff --git a/test/testclnt.lua b/test/testclnt.lua
index c2c782c..e3f2b94 100644
--- a/test/testclnt.lua
+++ b/test/testclnt.lua
@@ -465,16 +465,14 @@ print("Testing "  .. 2*size .. " bytes")
 remote(string.format([[
     data:send(string.rep("a", %d))
     socket.sleep(0.5)
-    data:send(string.rep("b", %d))
+    data:send(string.rep("b", %d) .. "\n")
 ]], size, size))
     local err = "timeout"
     local part = ""
     local str
     data:settimeout(0)
     while 1 do
-        local needed = 2*size - string.len(part)
-        assert(needed > 0, "weird")
-        str, err, part = data:receive(needed, part)
+        str, err, part = data:receive("*l", part)
         if err ~= "timeout" then break end
     end
     assert(str == (string.rep("a", size) .. string.rep("b", size)))
@@ -482,15 +480,14 @@ remote(string.format([[
 remote(string.format([[
     str = data:receive(%d)
     socket.sleep(0.5)
-    str = data:receive(%d, str)
+    str = data:receive(2*%d, str)
     data:send(str)
 ]], size, size))
     data:settimeout(0)
-    local sofar = 1
+    local start = 0
     while 1 do
-        _, err, part = data:send(str, sofar)
+        ret, err, start = data:send(str, start+1)
         if err ~= "timeout" then break end
-        sofar = sofar + part
     end
     data:send("\n")
     data:settimeout(-1)
@@ -501,6 +498,7 @@ end
 
 ------------------------------------------------------------------------
 
+
 test("method registration")
 test_methods(socket.tcp(), {
     "accept",
@@ -622,7 +620,7 @@ test_nonblocking(17)
 test_nonblocking(200)
 test_nonblocking(4091)
 test_nonblocking(80199)
-test_nonblocking(8000000)
+test_nonblocking(800000)
 test_nonblocking(80199)
 test_nonblocking(4091)
 test_nonblocking(200)