Merged branch 'master' of git://git.tokkee.org/sysdb.

[sysdb.git] / t / frontend / sock_test.c

diff --git a/t/frontend/sock_test.c b/t/frontend/sock_test.c
index 4ac8196d9dba07ac89de64d28002242793601511..55f1a0c47789229457ad0febd84610eda5d1fa6c 100644 (file)
--- a/t/frontend/sock_test.c
+++ b/t/frontend/sock_test.c
@@ -30,6 +30,8 @@
 
 #include <check.h>
 
+#include <errno.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -37,6 +39,10 @@
 
 #include <pthread.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
 /*
  * private variables
  */
@@ -107,6 +113,9 @@ START_TEST(test_listen_and_serve)
 
        pthread_t thr;
 
+       int sock_fd;
+       struct sockaddr_un sa;
+
        check = sdb_fe_sock_listen_and_serve(sock, &loop);
        fail_unless(check < 0,
                        "sdb_fe_sock_listen_and_serve() = %i; "
@@ -119,16 +128,42 @@ START_TEST(test_listen_and_serve)
        fail_unless(check == 0,
                        "INTERNAL ERROR: pthread_create() = %i; expected: 0", check);
 
-       /* wait for the socket to appear */
-       while (access(tmp_file, F_OK)) {
-               struct timespec ts = { 0, 100000000 };
-               nanosleep(&ts, NULL);
+       sock_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+       fail_unless(sock_fd >= 0,
+                       "INTERNAL ERROR: socket() = %d; expected: >= 0", sock_fd);
+
+       sa.sun_family = AF_UNIX;
+       strncpy(sa.sun_path, tmp_file, sizeof(sa.sun_path));
+
+       /* wait for socket to become available */
+       errno = ECONNREFUSED;
+       while (errno == ECONNREFUSED) {
+               check = connect(sock_fd, (struct sockaddr *)&sa, sizeof(sa));
+               if (! check)
+                       break;
+
+               fail_unless(errno == ECONNREFUSED,
+                               "INTERNAL ERROR: connect() = %d [errno=%d]; expected: 0",
+                               check, errno);
        }
 
+       close(sock_fd);
+
        loop.do_loop = 0;
        pthread_join(thr, NULL);
 
-       unlink(tmp_file);
+       fail_unless(access(tmp_file, F_OK),
+                       "sdb_fe_sock_listen_and_serve() did not clean up "
+                       "socket %s", tmp_file);
+
+       /* should do nothing and not report errors */
+       check = sdb_fe_sock_listen_and_serve(sock, &loop);
+       fail_unless(check == 0,
+                       "sdb_fe_sock_listen_and_serve() = %i; "
+                       "expected: <0 (do_loop == 0)", check);
+       fail_unless(access(tmp_file, F_OK),
+                       "sdb_fe_sock_listen_and_serve() recreated socket "
+                       "(do_loop == 0)");
 }
 END_TEST