3 files changed, 29 insertions, 2 deletions

diff --git a/test/test_bind.lua b/test/test_bind.lua
new file mode 100644
index 0000000..93c42d7
--- /dev/null
+++ b/test/test_bind.lua
@@ -0,0 +1,6 @@
+local socket = require "socket"
+local u = socket.udp() assert(u:setsockname("*", 5088)) u:close()
+local u = socket.udp() assert(u:setsockname("*", 0)) u:close()
+local t = socket.tcp() assert(t:bind("*", 5088)) t:close()
+local t = socket.tcp() assert(t:bind("*", 0)) t:close()
+print("done!")
\ No newline at end of file
diff --git a/test/test_getaddrinfo.lua b/test/test_getaddrinfo.lua
new file mode 100644
index 0000000..4b52ff9
--- /dev/null
+++ b/test/test_getaddrinfo.lua
@@ -0,0 +1,15 @@
+local socket = require "socket"
+local addresses = assert(socket.dns.getaddrinfo("localhost"))
+assert(type(addresses) == 'table')
+
+local ipv4mask = "^%d%d?%d?%.%d%d?%d?%.%d%d?%d?%.%d%d?%d?$"
+
+for i, alt in ipairs(addresses) do
+  if alt.family == 'inet' then
+    assert(type(alt.addr) == 'string')
+    assert(alt.addr:find(ipv4mask))
+    assert(alt.addr == '127.0.0.1')
+  end
+end
+
+print("done!")
diff --git a/test/testclnt.lua b/test/testclnt.lua
index 8acb3d0..315783b 100644
--- a/test/testclnt.lua
+++ b/test/testclnt.lua
@@ -642,7 +642,10 @@ local tcp_methods = {
     "shutdown",
 }
 test_methods(socket.tcp(), tcp_methods)
-test_methods(socket.tcp6(), tcp_methods)
+do local sock = socket.tcp6()
+if sock then test_methods(socket.tcp6(), tcp_methods)
+else io.stderr:write("Warning! IPv6 does not support!\n") end
+end
 
 local udp_methods = {
     "close", 
@@ -666,7 +669,10 @@ local udp_methods = {
 
 ------------------------------------------------------------------------
 test_methods(socket.udp(), udp_methods)
-test_methods(socket.udp6(), udp_methods)
+do local sock = socket.tcp6()
+if sock then test_methods(socket.udp6(), udp_methods)
+else io.stderr:write("Warning! IPv6 does not support!\n") end
+end
 
 test("partial receive")
 test_partialrecv()