ctdb-tests: Use setup_script_options() in 50.samba tests

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

diff --git a/ctdb/tests/eventscripts/50.samba.monitor.106.sh b/ctdb/tests/eventscripts/50.samba.monitor.106.sh
index 1dce06d8e241ebbfcfb7c55462ea64e2c4984a47..80bccef1e773dc465d2103a8e31be19aba98882f 100755 (executable)
--- a/ctdb/tests/eventscripts/50.samba.monitor.106.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.106.sh
@@ -6,7 +6,9 @@ define_test "non-existent share - not checked"
 
 setup
 
+setup_script_options <<EOF
 CTDB_SAMBA_SKIP_SHARE_CHECK="yes"
+EOF
 
 ok_null
 

diff --git a/ctdb/tests/eventscripts/scripts/50.samba.sh b/ctdb/tests/eventscripts/scripts/50.samba.sh
index 4e7e146b4519653a926d123cad68ff005dc3d8b2..ce5c0a372ad8f8746d713782a1b5fbe6be9e5c52 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/50.samba.sh
+++ b/ctdb/tests/eventscripts/scripts/50.samba.sh
@@ -11,7 +11,9 @@ setup ()
                        service "$i" force-started
                done
 
-               export CTDB_MANAGES_SAMBA="yes"
+               setup_script_options <<EOF
+CTDB_MANAGES_SAMBA="yes"
+EOF
 
                setup_tcp_listen 445 139
 
@@ -27,12 +29,16 @@ setup ()
                        service "$i" force-stopped
                done
 
-               export CTDB_MANAGES_SAMBA=""
+               setup_script_options <<EOF
+CTDB_MANAGES_SAMBA=""
+EOF
 
                setup_tcp_listen
        fi
 
-       export CTDB_SAMBA_SKIP_SHARE_CHECK="no"
+       setup_script_options <<EOF
+CTDB_SAMBA_SKIP_SHARE_CHECK="no"
+EOF
 
        setup_shares