*** empty log message ***

6 files changed, 5 insertions, 24 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a18e4c2..eb9c277 100755
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,6 @@ TESTPROGRAMS = \
 	dns-test			\
 	dns-test-async			\
 	dns-test2			\
-	dns-wait-test			\
 	rdns-test-async			\
 	uri-test			\
 	http-test			\
@@ -28,7 +27,6 @@ simple_test_LDADD =		$(top_builddir)/src/liblac-1.la
 dns_test_LDADD =		$(top_builddir)/src/liblac-1.la
 dns_test_async_LDADD =		$(top_builddir)/src/liblac-1.la
 dns_test2_LDADD =		$(top_builddir)/src/liblac-1.la
-dns_wait_test_LDADD =		$(top_builddir)/src/liblac-1.la
 rdns_test_async_LDADD =		$(top_builddir)/src/liblac-1.la
 uri_test_LDADD =		$(top_builddir)/src/liblac-1.la
 connection_test_LDADD =		$(top_builddir)/src/liblac-1.la
diff --git a/tests/connection2-test.c b/tests/connection2-test.c
index c2bc370..898436a 100644
--- a/tests/connection2-test.c
+++ b/tests/connection2-test.c
@@ -28,7 +28,7 @@ int
 main (int argc, char *argv[])
 {
     LacAddress *addr =
-        lac_address_new_from_name_wait ("www.toyota.co.jp", NULL, NULL);
+        lac_address_new_from_name_wait ("www.toyota.co.jp", NULL);
     int fd;
     guchar blah[60000];
     GTimer *timer;
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
 
     g_assert (lac_connect (fd, addr, 80, NULL));
 
-#define line1 "GET / HTTP/1.1\r\n"
+#define line1 "GET /index.html HTTP/1.1\r\n"
 #define line2 "host: www.toyota.co.jp\r\n\r\n"
 
     timer = g_timer_new ();
diff --git a/tests/dns-test2.c b/tests/dns-test2.c
index c70b91b..3233cf0 100644
--- a/tests/dns-test2.c
+++ b/tests/dns-test2.c
@@ -95,17 +95,9 @@ main (int argc, char *argv[])
     {
         for (i = 1; i < argc; ++i)
         {
-            LacActivity activity;
             ++n_outstanding;
-            activity = lac_address_new_lookup_all_from_name (
+            lac_address_new_lookup_all_from_name (
                 argv[i], callback, argv[i]);
-
-            if (i == 3 || i == 4)
-            {
-                g_print ("canceling\n");
-                lac_activity_cancel (activity);
-            }
-            
         }
     }
     else
diff --git a/tests/dns-wait-test.c b/tests/dns-wait-test.c
index 224368c..43cb289 100644
--- a/tests/dns-wait-test.c
+++ b/tests/dns-wait-test.c
@@ -24,15 +24,6 @@
 #include <netinet/tcp.h>
 #include <string.h>
 
-static gboolean
-timeout (gpointer data)
-{
-    LacActivity activity = data;
-    g_print ("hej\n");
-    lac_activity_cancel (activity);
-    return FALSE;
-}
-
 int
 main (int argc, char *argv[])
 {
diff --git a/tests/udp-test.c b/tests/udp-test.c
index d91254d..37bb08c 100644
--- a/tests/udp-test.c
+++ b/tests/udp-test.c
@@ -34,7 +34,7 @@ main (int argc, char *argv[])
     GError *err = NULL;
     int fd;
 
-    addr = lac_address_new_from_localhost_wait (NULL, NULL);
+    addr = lac_address_new_from_localhost_wait (NULL);
     if (!addr)
     {
         g_print ("can't find local IP address \n");
diff --git a/tests/watch-test.c b/tests/watch-test.c
index 91ccf42..362ff10 100644
--- a/tests/watch-test.c
+++ b/tests/watch-test.c
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
     GError *err = NULL;
     int fd;
 
-    addr = lac_address_new_from_name_wait ("www.daimi.au.dk.", NULL, NULL);
+    addr = lac_address_new_from_name_wait ("www.daimi.au.dk.", NULL);
     g_print ("address is: %s\n", lac_address_to_string (addr));
     fd = lac_socket_tcp (NULL);
     if (!lac_connect (fd, addr, 80, &err))