use shutdown in more tests

(This used to be ctdb commit 150153947b959f90991fdae8d7c85ef8d551dff5)

diff --git a/ctdb/tests/ctdb_bench.c b/ctdb/tests/ctdb_bench.c
index 8df084b4dc1495937eaea7b9430096e3a9cd9ed9..5df680f8ff07e8266c9e78d3cb35903f17fd725a 100644 (file)
--- a/ctdb/tests/ctdb_bench.c
+++ b/ctdb/tests/ctdb_bench.c
@@ -259,6 +259,7 @@ int main(int argc, const char *argv[])
        bench_ring(ctdb, ev);
        
        /* shut it down */
-       talloc_free(ctdb);
+       ctdb_shutdown(ctdb);
+
        return 0;
 }

diff --git a/ctdb/tests/ctdb_fetch.c b/ctdb/tests/ctdb_fetch.c
index e084b1bad8af9f0d292e011aed5b46fef5f8f3a9..39bd861fc1d589af70acc8c1ddb704524d53b7e6 100644 (file)
--- a/ctdb/tests/ctdb_fetch.c
+++ b/ctdb/tests/ctdb_fetch.c
@@ -247,7 +247,8 @@ int main(int argc, const char *argv[])
 
        printf("DATA:\n%s\n", (char *)call.reply_data.dptr);
 
-       /* shut it down */
-       talloc_free(ctdb);
+       /* go into a wait loop to allow other nodes to complete */
+       ctdb_shutdown(ctdb);
+
        return 0;
 }

diff --git a/ctdb/tests/ctdb_messaging.c b/ctdb/tests/ctdb_messaging.c
index 137acd6163b219010dd0cf13225a1f6b46c8b642..e7057b64fb970cf37a420fe7a93e87e4e235ac4e 100644 (file)
--- a/ctdb/tests/ctdb_messaging.c
+++ b/ctdb/tests/ctdb_messaging.c
@@ -141,6 +141,7 @@ int main(int argc, const char *argv[])
        }
        
        /* shut it down */
-       talloc_free(ctdb);
+       ctdb_shutdown(ctdb);
+
        return 0;
 }