From 34eba35c61f5123d08a2403817e99777decb0617 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Mon, 12 Feb 2018 14:10:12 +1100
Subject: [PATCH] ctdb-tests: 49.winbind event script setup modularisation

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---
 ctdb/tests/eventscripts/49.winbind.monitor.001.sh  | 2 +-
 ctdb/tests/eventscripts/49.winbind.monitor.101.sh  | 2 +-
 ctdb/tests/eventscripts/49.winbind.monitor.102.sh  | 3 ++-
 ctdb/tests/eventscripts/49.winbind.shutdown.001.sh | 2 +-
 ctdb/tests/eventscripts/49.winbind.shutdown.002.sh | 5 +++--
 ctdb/tests/eventscripts/49.winbind.startup.001.sh  | 2 +-
 ctdb/tests/eventscripts/49.winbind.startup.002.sh  | 5 +++--
 ctdb/tests/eventscripts/scripts/49.winbind.sh      | 4 +---
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ctdb/tests/eventscripts/49.winbind.monitor.001.sh b/ctdb/tests/eventscripts/49.winbind.monitor.001.sh
index 94253d82f6b..00f8180901f 100755
--- a/ctdb/tests/eventscripts/49.winbind.monitor.001.sh
+++ b/ctdb/tests/eventscripts/49.winbind.monitor.001.sh
@@ -4,7 +4,7 @@
 
 define_test "not managed, check no-op"
 
-setup_winbind "down"
+setup "down"
 
 ok_null
 
diff --git a/ctdb/tests/eventscripts/49.winbind.monitor.101.sh b/ctdb/tests/eventscripts/49.winbind.monitor.101.sh
index ec2952b76b2..3884a33a986 100755
--- a/ctdb/tests/eventscripts/49.winbind.monitor.101.sh
+++ b/ctdb/tests/eventscripts/49.winbind.monitor.101.sh
@@ -4,7 +4,7 @@
 
 define_test "all OK"
 
-setup_winbind
+setup
 
 ok_null
 
diff --git a/ctdb/tests/eventscripts/49.winbind.monitor.102.sh b/ctdb/tests/eventscripts/49.winbind.monitor.102.sh
index e4a4cacb3f2..24e4ed251c7 100755
--- a/ctdb/tests/eventscripts/49.winbind.monitor.102.sh
+++ b/ctdb/tests/eventscripts/49.winbind.monitor.102.sh
@@ -4,7 +4,8 @@
 
 define_test "winbind down"
 
-setup_winbind
+setup
+
 wbinfo_down
 
 required_result 1 "ERROR: wbinfo -p returned error"
diff --git a/ctdb/tests/eventscripts/49.winbind.shutdown.001.sh b/ctdb/tests/eventscripts/49.winbind.shutdown.001.sh
index f8b9eb67f3a..328e1e49cbf 100755
--- a/ctdb/tests/eventscripts/49.winbind.shutdown.001.sh
+++ b/ctdb/tests/eventscripts/49.winbind.shutdown.001.sh
@@ -4,7 +4,7 @@
 
 define_test "not managed"
 
-setup_winbind "down"
+setup "down"
 
 ok_null
 simple_test
diff --git a/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh b/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
index 6dee4506bcb..94030a1d792 100755
--- a/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
@@ -4,8 +4,9 @@
 
 define_test "managed"
 
-setup_winbind "up"
-export CTDB_MANAGES_WINBIND="yes"
+setup "up"
+
+CTDB_MANAGES_WINBIND="yes"
 
 ok <<EOF
 Stopping winbind: OK
diff --git a/ctdb/tests/eventscripts/49.winbind.startup.001.sh b/ctdb/tests/eventscripts/49.winbind.startup.001.sh
index f8b9eb67f3a..328e1e49cbf 100755
--- a/ctdb/tests/eventscripts/49.winbind.startup.001.sh
+++ b/ctdb/tests/eventscripts/49.winbind.startup.001.sh
@@ -4,7 +4,7 @@
 
 define_test "not managed"
 
-setup_winbind "down"
+setup "down"
 
 ok_null
 simple_test
diff --git a/ctdb/tests/eventscripts/49.winbind.startup.002.sh b/ctdb/tests/eventscripts/49.winbind.startup.002.sh
index 6653f55a6df..5ba71db94a6 100755
--- a/ctdb/tests/eventscripts/49.winbind.startup.002.sh
+++ b/ctdb/tests/eventscripts/49.winbind.startup.002.sh
@@ -4,8 +4,9 @@
 
 define_test "managed"
 
-setup_winbind "down"
-export CTDB_MANAGES_WINBIND="yes"
+setup "down"
+
+CTDB_MANAGES_WINBIND="yes"
 
 ok <<EOF
 Starting winbind: OK
diff --git a/ctdb/tests/eventscripts/scripts/49.winbind.sh b/ctdb/tests/eventscripts/scripts/49.winbind.sh
index a4d00bfa34c..2c35917f424 100644
--- a/ctdb/tests/eventscripts/scripts/49.winbind.sh
+++ b/ctdb/tests/eventscripts/scripts/49.winbind.sh
@@ -1,7 +1,5 @@
-setup_winbind ()
+setup ()
 {
-	setup_ctdb
-
 	service_name="winbind"
 
 	if [ "$1" != "down" ] ; then
-- 
2.34.1