ctdb-tests: Rename setup_config() to setup_tunable_config()

Drop the "CTDB_SET_" prefix from variable names and add it back for
now.  When there is a better way of setting tunables then this
function will support that.

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

diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.002.sh b/ctdb/tests/eventscripts/00.ctdb.setup.002.sh
index e91f8d7e11cac4b8be1d49d8e5b830b9ea8ab673..fc1ec76996ab40a3facde66ed0184d3f6bd5ec1b 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.setup.002.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.setup.002.sh
@@ -6,9 +6,9 @@ define_test "setup, known tunables in config"
 
 setup
 
-setup_config <<EOF
-CTDB_SET_MonitorInterval=5
-CTDB_SET_TDBMutexEnabled=0
+setup_tunable_config <<EOF
+MonitorInterval=5
+TDBMutexEnabled=0
 EOF
 
 required_result 0 <<EOF

diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.003.sh b/ctdb/tests/eventscripts/00.ctdb.setup.003.sh
index 898a6835321ad9cc373db151e4f05ac988633d5d..6b76ce9ff6462c219fd5f028f2b9924b12e6d1f3 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.setup.003.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.setup.003.sh
@@ -6,9 +6,9 @@ define_test "setup, known and unknown tunables in config"
 
 setup
 
-setup_config <<EOF
-CTDB_SET_MonitorInterval=5
-CTDB_SET_UnknownMagic=0
+setup_tunable_config <<EOF
+MonitorInterval=5
+UnknownMagic=0
 EOF
 
 required_result 1 <<EOF

diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.004.sh b/ctdb/tests/eventscripts/00.ctdb.setup.004.sh
index 636cd2bead90ef7006e02ae29abdd1d87b1421af..eebf93b2534f3223f7868b3679dac88157989843 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.setup.004.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.setup.004.sh
@@ -6,9 +6,9 @@ define_test "setup, known and obsolete tunables in config"
 
 setup
 
-setup_config <<EOF
-CTDB_SET_MonitorInterval=5
-CTDB_SET_EventScriptUnhealthyOnTimeout=0
+setup_tunable_config <<EOF
+MonitorInterval=5
+EventScriptUnhealthyOnTimeout=0
 EOF
 
 required_result 0 <<EOF

diff --git a/ctdb/tests/eventscripts/scripts/00.ctdb.sh b/ctdb/tests/eventscripts/scripts/00.ctdb.sh
index 68db2de996fa3624ffaa95bf7684197ada6ab720..c17634984e837b09912db7fb6088b42eee94973d 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/00.ctdb.sh
+++ b/ctdb/tests/eventscripts/scripts/00.ctdb.sh
@@ -16,13 +16,18 @@ setup ()
               "
 }
 
-setup_config ()
+setup_tunable_config ()
 {
        _t="${EVENTSCRIPTS_TESTS_VAR_DIR}/fake-tunable-config.sh"
        export FAKE_CTDB_EXTRA_CONFIG="$_t"
        rm -f "$FAKE_CTDB_EXTRA_CONFIG"
 
-       cat >"$FAKE_CTDB_EXTRA_CONFIG"
+       while read line ; do
+               case "$line" in
+               \#*|"") : ;;
+               *) echo "CTDB_SET_${line}"
+               esac
+       done >"$FAKE_CTDB_EXTRA_CONFIG"
 }
 
 result_filter ()