X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Funit%2Ffrontend%2Fsock_test.c;h=14b20907ca9051b680ddd7eec3ee7a05c218f384;hb=1ef0d00327e4b5f56b438f44053f48fd8b198baa;hp=09f8ae91cc597341b2d186643f790ef697d9451d;hpb=9ae8f7f611c6b5328723d7b347db6993ee4811d5;p=sysdb.git

diff --git a/t/unit/frontend/sock_test.c b/t/unit/frontend/sock_test.c
index 09f8ae9..14b2090 100644
--- a/t/unit/frontend/sock_test.c
+++ b/t/unit/frontend/sock_test.c
@@ -30,7 +30,7 @@
 #endif
 
 #include "frontend/sock.h"
-#include "libsysdb_test.h"
+#include "testutils.h"
 
 #include <check.h>
 
@@ -75,7 +75,7 @@ sock_listen(char *tmp_file)
 	int check;
 
 	sprintf(sock_addr, "unix:%s", tmp_file);
-	check = sdb_fe_sock_add_listener(sock, sock_addr);
+	check = sdb_fe_sock_add_listener(sock, sock_addr, NULL);
 	fail_unless(check == 0,
 			"sdb_fe_sock_add_listener(%s) = %i; expected: 0",
 			sock_addr, check);
@@ -111,7 +111,7 @@ START_TEST(test_listen_and_serve)
 
 	pthread_t thr;
 
-	int sock_fd;
+	int fd, sock_fd;
 	struct sockaddr_un sa;
 
 	check = sdb_fe_sock_listen_and_serve(sock, &loop);
@@ -119,8 +119,9 @@ START_TEST(test_listen_and_serve)
 			"sdb_fe_sock_listen_and_serve() = %i; "
 			"expected: <0 (before adding listeners)", check);
 
-	mkstemp(tmp_file);
+	fd = mkstemp(tmp_file);
 	unlink(tmp_file);
+	close(fd);
 	sock_listen(tmp_file);
 
 	loop.do_loop = 1;
@@ -167,19 +168,14 @@ START_TEST(test_listen_and_serve)
 }
 END_TEST
 
-Suite *
-fe_sock_suite(void)
+TEST_MAIN("frontend::sock")
 {
-	Suite *s = suite_create("frontend::sock");
-	TCase *tc;
-
-	tc = tcase_create("core");
+	TCase *tc = tcase_create("core");
 	tcase_add_checked_fixture(tc, setup, teardown);
 	tcase_add_test(tc, test_listen_and_serve);
-	suite_add_tcase(s, tc);
-
-	return s;
-} /* util_unixsock_suite */
+	ADD_TCASE(tc);
+}
+TEST_MAIN_END
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */