From: Martin Schwenke <martin@meltin.net>
Date: Wed, 21 Mar 2018 11:18:56 +0000 (+1100)
Subject: ctdb-tests: Use setup_script_options() in 05.system tests
X-Git-Tag: talloc-2.1.13~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45de2b1d9b873d8be0f52ce90f059070aed6b22c;p=thirdparty%2Fsamba.git

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 1d56b123463..4e78a56e896 100755
--- 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 8b5274bb39d..41fd914bb04 100755
--- 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 f3472b38893..34003937c75 100755
--- 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 6f277e0bd5f..7e1a9531213 100755
--- 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 94fe4b2b02d..48008d9386c 100755
--- 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 614706848e7..68b99cfb521 100755
--- 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 4d6d6865084..bc517081e42 100755
--- 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 2b2d232d071..f4ea7ded6d0 100755
--- 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 b67c7b1cc8a..1b6d2155272 100755
--- 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 452ae6c0734..3f1fe9bfc46 100755
--- 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 5d338f79a56..459b8ba76b4 100755
--- 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 8ed214988ca..7f7480aed93 100755
--- 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 37840921934..37578d8bbed 100755
--- 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 18efff39dc1..eaf3e989b9f 100644
--- 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