Merge branch 'tests52' of https://github.com/Florob/luasocket into Florob-tests52

2 files changed, 14 insertions, 6 deletions

diff --git a/test/testclnt.lua b/test/testclnt.lua
index b4b7063..a510ded 100644
--- a/test/testclnt.lua
+++ b/test/testclnt.lua
@@ -617,13 +617,16 @@ end
 
 ------------------------------------------------------------------------
 test("method registration")
-test_methods(socket.tcp(), {
+
+local tcp_methods = {
     "accept",
     "bind",
     "close",
     "connect",
     "dirty",
+    "getfamily",
     "getfd",
+    "getoption",
     "getpeername",
     "getsockname",
     "getstats",
@@ -637,13 +640,16 @@ test_methods(socket.tcp(), {
     "setsockname",
     "settimeout",
     "shutdown",
-})
+}
+test_methods(socket.tcp(), tcp_methods)
+test_methods(socket.tcp6(), tcp_methods)
 
-test_methods(socket.udp(), {
+local udp_methods = {
     "close", 
-    "getpeername",
     "dirty",
+    "getfamily",
     "getfd",
+    "getoption",
     "getpeername",
     "getsockname",
     "receive", 
@@ -655,7 +661,9 @@ test_methods(socket.udp(), {
     "setpeername",
     "setsockname",
     "settimeout"
-})
+}
+test_methods(socket.udp(), udp_methods)
+test_methods(socket.udp6(), udp_methods)
 
 test("partial receive")
 test_partialrecv()
diff --git a/test/testsrvr.lua b/test/testsrvr.lua
index ff31442..72b93ab 100644
--- a/test/testsrvr.lua
+++ b/test/testsrvr.lua
@@ -15,6 +15,6 @@ while 1 do
         assert(command, emsg)
         assert(control:send(ack));
         print(command);
-                (load(command))();
+                ((loadstring or load)(command))();
     end
 end