ctdb-common: Start listening to sockets only on successful startup

[samba.git] / ctdb / tests / cunit / sock_daemon_test_001.sh

diff --git a/ctdb/tests/cunit/sock_daemon_test_001.sh b/ctdb/tests/cunit/sock_daemon_test_001.sh
index 9da484a761699f485272e89042f1e2040b97ec2e..bf925fbe2ab8aa9574eeac751fe99378772f890d 100755 (executable)
--- a/ctdb/tests/cunit/sock_daemon_test_001.sh
+++ b/ctdb/tests/cunit/sock_daemon_test_001.sh
@@ -23,24 +23,31 @@ result_filter ()
 
 
 ok <<EOF
+test1[PID]: daemon started, pid=PID
+test1[PID]: startup failed, ret=1
+test1[PID]: daemon started, pid=PID
+test1[PID]: startup completed successfully
 test1[PID]: listening on $sockpath
 test1[PID]: Shutting down
 EOF
 unit_test sock_daemon_test "$pidfile" "$sockpath" 1
 
 ok <<EOF
-test2[PID]: listening on $sockpath
 test2[PID]: daemon started, pid=PID
+test2[PID]: startup completed successfully
+test2[PID]: listening on $sockpath
 test2[PID]: Received signal 1
+test2[PID]: reconfigure failed, ret=1
 test2[PID]: Received signal 10
+test2[PID]: reconfigure completed successfully
 test2[PID]: Received signal 15
 test2[PID]: Shutting down
 EOF
 unit_test sock_daemon_test "$pidfile" "$sockpath" 2
 
 ok <<EOF
-test3[PID]: listening on $sockpath
 test3[PID]: daemon started, pid=PID
+test3[PID]: listening on $sockpath
 test3[PID]: PID PID gone away, exiting
 test3[PID]: Shutting down
 EOF
@@ -53,22 +60,23 @@ EOF
 unit_test sock_daemon_test "$pidfile" "$sockpath" 4
 
 ok <<EOF
-test5[PID]: listening on $sockpath
 test5[PID]: daemon started, pid=PID
+test5[PID]: listening on $sockpath
 test5[PID]: Received signal 15
 test5[PID]: Shutting down
 EOF
 unit_test sock_daemon_test "$pidfile" "$sockpath" 5
 
 ok <<EOF
-test6[PID]: listening on $sockpath
 test6[PID]: daemon started, pid=PID
+test6[PID]: listening on $sockpath
 test6[PID]: Shutting down
 EOF
 unit_test sock_daemon_test "$pidfile" "$sockpath" 6
 
 ok <<EOF
 test7[PID]: daemon started, pid=PID
+test7[PID]: startup completed successfully
 test7[PID]: Received signal 15
 test7[PID]: Shutting down
 EOF
@@ -76,9 +84,11 @@ unit_test sock_daemon_test "$pidfile" "$sockpath" 7
 
 ok <<EOF
 test8[PID]: daemon started, pid=PID
+test8[PID]: startup completed successfully
 test8[PID]: Received signal 15
 test8[PID]: Shutting down
 test8[PID]: daemon started, pid=PID
+test8[PID]: startup completed successfully
 test8[PID]: Received signal 15
 test8[PID]: Shutting down
 EOF
@@ -86,19 +96,21 @@ unit_test sock_daemon_test "$pidfile" "$sockpath" 8
 
 ok <<EOF
 test9[PID]: daemon started, pid=PID
+test9[PID]: startup completed successfully
 test9[PID]: Received signal 15
 test9[PID]: Shutting down
 test9[PID]: daemon started, pid=PID
+test9[PID]: startup completed successfully
 test9[PID]: Received signal 15
 test9[PID]: Shutting down
 EOF
 unit_test sock_daemon_test "$pidfile" "$sockpath" 9
 
 ok <<EOF
-test10[PID]: listening on $sockpath
 test10[PID]: daemon started, pid=PID
 test10[PID]: listening on $sockpath
 test10[PID]: daemon started, pid=PID
+test10[PID]: listening on $sockpath
 test10[PID]: Received signal 15
 test10[PID]: Shutting down
 EOF