ctdb-tests: Use setup_script_options() in 05.system tests

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

diff --git a/ctdb/tests/eventscripts/05.system.monitor.002.sh b/ctdb/tests/eventscripts/05.system.monitor.002.sh
index 1d56b1234635243a86c99aa507a1058ea6415d8e..4e78a56e89665b51af6901f406627e34ab6ba5f5 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.002.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.002.sh
@@ -6,7 +6,9 @@ define_test "Filesystem use check, good situation, 1 error check enabled"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_FILESYSTEM_USAGE="/var::80"
+EOF
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/05.system.monitor.003.sh b/ctdb/tests/eventscripts/05.system.monitor.003.sh
index 8b5274bb39d208f77e0bfe0590269367ea74bb69..41fd914bb04c27a38f7bd00d1e27f73dc9b869ef 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.003.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.003.sh
@@ -6,7 +6,9 @@ define_test "Filesystem use check, error situation, 1 error check enabled"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_FILESYSTEM_USAGE="/var::80"
+EOF
 
 set_fs_usage 90
 required_result 1 <<EOF

diff --git a/ctdb/tests/eventscripts/05.system.monitor.004.sh b/ctdb/tests/eventscripts/05.system.monitor.004.sh
index f3472b38893d96c372143c60efdab7825de68878..34003937c758a475792756ef4333075daf1cab0a 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.004.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.004.sh
@@ -6,7 +6,9 @@ define_test "Filesystem use check, warn situation, only error check enabled"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_FILESYSTEM_USAGE="/var::80"
+EOF
 
 set_fs_usage 70
 ok_null

diff --git a/ctdb/tests/eventscripts/05.system.monitor.005.sh b/ctdb/tests/eventscripts/05.system.monitor.005.sh
index 6f277e0bd5fa3e84ff2406990e0f09a6b648b104..7e1a95312133f95b82e5f1c97baf8cee2e279bbe 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.005.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.005.sh
@@ -6,7 +6,9 @@ define_test "Filesystem use check, warn situation, both checks enabled"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_FILESYSTEM_USAGE="/var:80:90"
+EOF
 
 set_fs_usage 85
 ok <<EOF

diff --git a/ctdb/tests/eventscripts/05.system.monitor.006.sh b/ctdb/tests/eventscripts/05.system.monitor.006.sh
index 94fe4b2b02d6453dac1f185b1f9ad39af642f133..48008d9386c6bfc3490aa5962a387943b2656ce8 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.006.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.006.sh
@@ -6,7 +6,9 @@ define_test "Filesystem use check, error situation, both checks enabled"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_FILESYSTEM_USAGE="/var:80:90"
+EOF
 
 set_fs_usage 95
 required_result 1 <<EOF

diff --git a/ctdb/tests/eventscripts/05.system.monitor.007.sh b/ctdb/tests/eventscripts/05.system.monitor.007.sh
index 614706848e7ee87386985df2706b819fb3db6502..68b99cfb5217a4e269fa0896246be896e484a8e9 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.007.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.007.sh
@@ -6,7 +6,9 @@ define_test "Filesystem use check, good situation, both checks enabled, multiple
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_FILESYSTEM_USAGE="/var:80:90 /:90:95"
+EOF
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/05.system.monitor.012.sh b/ctdb/tests/eventscripts/05.system.monitor.012.sh
index 4d6d6865084a9e4f1004355f0cd0569e6826f482..bc517081e429fb5e4edde9c3f3ff3498b84d7463 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.012.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.012.sh
@@ -6,8 +6,10 @@ define_test "Memory check, good situation, all memory checks enabled"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_MEMORY_USAGE="80:90"
 CTDB_MONITOR_SWAP_USAGE="1:50"
+EOF
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/05.system.monitor.013.sh b/ctdb/tests/eventscripts/05.system.monitor.013.sh
index 2b2d232d071eb04ec6b789ebe53ee7873585183b..f4ea7ded6d0121b7e3c9d7bda18deeae96b067fc 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.013.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.013.sh
@@ -6,7 +6,9 @@ define_test "Memory check, bad situation, custom swap critical"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_SWAP_USAGE=":50"
+EOF
 
 set_mem_usage 100 90
 required_result 1 <<EOF

diff --git a/ctdb/tests/eventscripts/05.system.monitor.014.sh b/ctdb/tests/eventscripts/05.system.monitor.014.sh
index b67c7b1cc8ae0446cbabd5089aa1df542f3c8c45..1b6d215527278839c3779785b0c7ea56e3b64fe2 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.014.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.014.sh
@@ -6,7 +6,9 @@ define_test "Memory check, bad memory situation, custom memory warning"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_MEMORY_USAGE="85:"
+EOF
 
 set_mem_usage 90 10
 ok <<EOF

diff --git a/ctdb/tests/eventscripts/05.system.monitor.015.sh b/ctdb/tests/eventscripts/05.system.monitor.015.sh
index 452ae6c07348fcf27e2cdf0a7a5b2119b6b498f1..3f1fe9bfc462befd76200c23c05908348acf0d84 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.015.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.015.sh
@@ -6,7 +6,9 @@ define_test "Memory check, bad situation, custom memory critical"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_MEMORY_USAGE=":85"
+EOF
 
 set_mem_usage 90 0
 required_result 1 <<EOF

diff --git a/ctdb/tests/eventscripts/05.system.monitor.016.sh b/ctdb/tests/eventscripts/05.system.monitor.016.sh
index 5d338f79a565e71b4552190b7dfc83976c392cad..459b8ba76b4418f17b231b7ec31e578246cfe6fc 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.016.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.016.sh
@@ -6,8 +6,10 @@ define_test "Memory check, bad situation, both memory checks, causes warning"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_MEMORY_USAGE="80:90"
 CTDB_MONITOR_SWAP_USAGE=""
+EOF
 
 set_mem_usage 87 0
 ok <<EOF

diff --git a/ctdb/tests/eventscripts/05.system.monitor.017.sh b/ctdb/tests/eventscripts/05.system.monitor.017.sh
index 8ed214988ca597d4eb85d9ac92d16205d1a8a001..7f7480aed93963d07a1bbd88aeb88d94167e7382 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.017.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.017.sh
@@ -6,7 +6,9 @@ define_test "Memory check, bad situation, both custom memory checks, causes unhe
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_MEMORY_USAGE="70:80"
+EOF
 
 set_mem_usage 87 0
 required_result 1 <<EOF

diff --git a/ctdb/tests/eventscripts/05.system.monitor.018.sh b/ctdb/tests/eventscripts/05.system.monitor.018.sh
index 3784092193492b0d3673b6e05883330f0ae9365d..37578d8bbedcc39fea99bc41468b073b4191f20a 100755 (executable)
--- a/ctdb/tests/eventscripts/05.system.monitor.018.sh
+++ b/ctdb/tests/eventscripts/05.system.monitor.018.sh
@@ -6,8 +6,10 @@ define_test "Check throttling of warnings"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MONITOR_MEMORY_USAGE="70:80"
 CTDB_MONITOR_SWAP_USAGE=""
+EOF
 
 # Below threshold, nothing logged
 set_mem_usage 67 0

diff --git a/ctdb/tests/eventscripts/scripts/05.system.sh b/ctdb/tests/eventscripts/scripts/05.system.sh
index 18efff39dc1129794f5cf52856dfcf958cec8bf6..eaf3e989b9fd17d2d45086d64157c7d8166d5537 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/05.system.sh
+++ b/ctdb/tests/eventscripts/scripts/05.system.sh
@@ -40,10 +40,6 @@ setup ()
 {
        setup_dbdir
 
-       export CTDB_MONITOR_MEMORY_USAGE=""
-       export CTDB_MONITOR_SWAP_USAGE=""
-       export CTDB_MONITOR_FILESYSTEM_USAGE=""
-
        # Tests use default unless explicitly set
        set_mem_usage
        set_fs_usage