ctdb-tests: Removing sleep from porting_tests
authorAmitay Isaacs <amitay@gmail.com>
Wed, 27 Jul 2016 05:21:39 +0000 (15:21 +1000)
committerStefan Metzmacher <metze@samba.org>
Thu, 28 Jul 2016 03:00:18 +0000 (05:00 +0200)
This avoids test failures due to timing issues.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
ctdb/tests/src/porting_tests.c

index e199d964ca4f0237c803d78083f308602dafade8..c9562876771e38abd5a56bb5674cee6953619a22 100644 (file)
@@ -158,7 +158,7 @@ static int socket_client_close(int client)
 static int fork_helper(void)
 {
        pid_t pid;
-       int i, client, max_rounds = 10;
+       int client;
 
        pid = fork();
        assert(pid != -1);
@@ -166,9 +166,6 @@ static int fork_helper(void)
        if (pid == 0) { // Child
                client = socket_client_connect();
                socket_client_write(client);
-               for (i = 1 ; i <= max_rounds ; i++ ) {
-                       sleep(1);
-               }
                socket_client_close(client);
                exit(0);
        } else {
@@ -249,13 +246,13 @@ int main(int argc, const char *argv[])
        ret = socket_server_create();
        assert(ret == 0);
 
-       ret = fork_helper();
-       assert(ret == 0);
-
        /* FIXME: Test tcp_checksum6, tcp_checksum */
        /* FIXME: Test ctdb_sys_send_arp, ctdb_sys_send_tcp */
        /* FIXME: Test ctdb_sys_{open,close}_capture_socket, ctdb_sys_read_tcp_packet */
        test_ctdb_sys_check_iface_exists();
+
+       ret = fork_helper();
+       assert(ret == 0);
        test_ctdb_get_peer_pid();
 
        ret = socket_server_close();