From: Martin Schwenke <martin@meltin.net>
Date: Thu, 22 Mar 2018 01:03:56 +0000 (+1100)
Subject: ctdb-tests: Use setup_script_options() in 50.samba tests
X-Git-Tag: talloc-2.1.13~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96ed6c34ba0d3513d7eeb3090a996bd0e369c4e4;p=thirdparty%2Fsamba.git

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 1dce06d8e24..80bccef1e77 100755
--- 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 4e7e146b451..ce5c0a372ad 100644
--- 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