ctdb-tests: statd-callout script setup modularisation

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/eventscripts/scripts/statd-callout.sh b/ctdb/tests/eventscripts/scripts/statd-callout.sh
index dc49efb36584c27d1f36954fb08d06855df7bdfb..88dc9acdf78578f5df7c4ce69dd96a5bfa56544b 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/statd-callout.sh
+++ b/ctdb/tests/eventscripts/scripts/statd-callout.sh
@@ -1,3 +1,10 @@
+setup ()
+{
+       ctdb_set_pnn
+       setup_public_addresses
+       setup_date "123456789"
+}
+
 ctdb_catdb_format_pairs ()
 {
        _count=0
@@ -24,7 +31,7 @@ check_ctdb_tdb_statd_state ()
                while read _x _sip _x ; do
                        for _cip ; do
                                cat <<EOF
-statd-state@${_sip}@${_cip} $FAKE_DATE_OUTPUT
+statd-state@${_sip}@${_cip} $(date)
 EOF
                        done
                done |

diff --git a/ctdb/tests/eventscripts/statd-callout.001.sh b/ctdb/tests/eventscripts/statd-callout.001.sh
index 29b9fbc8bfc70e24c0df353529b2555a581d3f89..72933905bbd9f10a954f09e4280a9ccab68bde08 100755 (executable)
--- a/ctdb/tests/eventscripts/statd-callout.001.sh
+++ b/ctdb/tests/eventscripts/statd-callout.001.sh
@@ -4,9 +4,7 @@
 
 define_test "single add-client"
 
-setup_ctdb
-
-FAKE_DATE_OUTPUT="1234565789"
+setup
 
 ok_null
 simple_test_event "add-client" "192.168.123.45"

diff --git a/ctdb/tests/eventscripts/statd-callout.002.sh b/ctdb/tests/eventscripts/statd-callout.002.sh
index 009da1b0d9d453adbcf31d37f463e6ddee29de48..ce9f139e9be7de677098aef3d3e68c0e29999d9b 100755 (executable)
--- a/ctdb/tests/eventscripts/statd-callout.002.sh
+++ b/ctdb/tests/eventscripts/statd-callout.002.sh
@@ -4,9 +4,7 @@
 
 define_test "2 x add-client, update"
 
-setup_ctdb
-
-FAKE_DATE_OUTPUT="1234565789"
+setup
 
 ok_null
 simple_test_event "add-client" "192.168.123.45"

diff --git a/ctdb/tests/eventscripts/statd-callout.003.sh b/ctdb/tests/eventscripts/statd-callout.003.sh
index ed28de683e030205f34b776071c229727970106e..25bec29824bc0aaeddc56828fe354dd2d6f2368f 100755 (executable)
--- a/ctdb/tests/eventscripts/statd-callout.003.sh
+++ b/ctdb/tests/eventscripts/statd-callout.003.sh
@@ -4,9 +4,7 @@
 
 define_test "add-client, update, del-client, update"
 
-setup_ctdb
-
-FAKE_DATE_OUTPUT="1234565789"
+setup
 
 ok_null
 simple_test_event "add-client" "192.168.123.45"

diff --git a/ctdb/tests/eventscripts/statd-callout.004.sh b/ctdb/tests/eventscripts/statd-callout.004.sh
index 011ced9578f774cebe0539afd305765885fbd527..dc2156b460ccf10452c7542f19bf91bb473e5ca5 100755 (executable)
--- a/ctdb/tests/eventscripts/statd-callout.004.sh
+++ b/ctdb/tests/eventscripts/statd-callout.004.sh
@@ -4,9 +4,7 @@
 
 define_test "single add-client, notify"
 
-setup_ctdb
-
-FAKE_DATE_OUTPUT="1234565789"
+setup
 
 ok_null
 simple_test_event "add-client" "192.168.123.45"

diff --git a/ctdb/tests/eventscripts/statd-callout.005.sh b/ctdb/tests/eventscripts/statd-callout.005.sh
index 06d4a1f43fad006bb967d96d934dedd859047066..1f802a2e8c3dcd334a94122b3ba753116a722b62 100755 (executable)
--- a/ctdb/tests/eventscripts/statd-callout.005.sh
+++ b/ctdb/tests/eventscripts/statd-callout.005.sh
@@ -4,9 +4,7 @@
 
 define_test "2 x add-client to different nodes, notify on 1"
 
-setup_ctdb
-
-FAKE_DATE_OUTPUT="1234565789"
+setup
 
 ok_null
 simple_test_event "add-client" "192.168.123.45"

diff --git a/ctdb/tests/eventscripts/statd-callout.006.sh b/ctdb/tests/eventscripts/statd-callout.006.sh
index edeeda872863f91150e7d9e5ebd9f657683d1cd9..8ecba5ceeed428a6e5967f4a637bb4441107dece 100755 (executable)
--- a/ctdb/tests/eventscripts/statd-callout.006.sh
+++ b/ctdb/tests/eventscripts/statd-callout.006.sh
@@ -4,9 +4,7 @@
 
 define_test "2 x add-client to different nodes, notify on both"
 
-setup_ctdb
-
-FAKE_DATE_OUTPUT="1234565789"
+setup
 
 ok_null
 simple_test_event "add-client" "192.168.123.45"

diff --git a/ctdb/tests/eventscripts/statd-callout.007.sh b/ctdb/tests/eventscripts/statd-callout.007.sh
index 32339cd3b77a040dbddb59456af6dadb39453149..4445fff274ab68a7e5099b1f8c1b4c6c1c4c8711 100755 (executable)
--- a/ctdb/tests/eventscripts/statd-callout.007.sh
+++ b/ctdb/tests/eventscripts/statd-callout.007.sh
@@ -4,9 +4,7 @@
 
 define_test "add-client, del-client, update"
 
-setup_ctdb
-
-FAKE_DATE_OUTPUT="1234565789"
+setup
 
 ok_null
 simple_test_event "add-client" "192.168.123.45"