From: Martin Schwenke <martin@meltin.net>
Date: Fri, 9 Feb 2018 05:36:04 +0000 (+1100)
Subject: ctdb-tests: New support functions setup_dbdir() and setup_date()
X-Git-Tag: talloc-2.1.13~191
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3571345667e56c77a969b54febfee4397c558bfd;p=thirdparty%2Fsamba.git

ctdb-tests: New support functions setup_dbdir() and setup_date()

For now, these need to be called from setup_generic() to stop tests
from breaking.

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

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index f03935b3981..573ce86c960 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -66,6 +66,20 @@ fi
 
 # General setup fakery
 
+setup_dbdir ()
+{
+	export CTDB_DBDIR="${EVENTSCRIPTS_TESTS_VAR_DIR}/db"
+	export CTDB_DBDIR_PERSISTENT="${CTDB_DBDIR}/persistent"
+	export CTDB_DBDIR_STATE="${CTDB_DBDIR}/state"
+	mkdir -p "$CTDB_DBDIR_PERSISTENT"
+	mkdir -p "$CTDB_DBDIR_STATE"
+}
+
+setup_date ()
+{
+	export FAKE_DATE_OUTPUT="$1"
+}
+
 setup_generic ()
 {
     debug "Setting up shares (3 existing shares)"
@@ -81,15 +95,11 @@ setup_generic ()
     mkdir -p "$FAKE_PROC_NET_BONDING"
     rm -f "$FAKE_PROC_NET_BONDING"/*
 
-    export CTDB_DBDIR="${EVENTSCRIPTS_TESTS_VAR_DIR}/db"
-    export CTDB_DBDIR_PERSISTENT="${CTDB_DBDIR}/persistent"
-    export CTDB_DBDIR_STATE="${CTDB_DBDIR}/state"
-    mkdir -p "$CTDB_DBDIR_PERSISTENT"
-    mkdir -p "$CTDB_DBDIR_STATE"
-
     export FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
     export FAKE_TDB_IS_OK
-    export FAKE_DATE_OUTPUT
+
+    setup_dbdir
+    setup_date
 
     export FAKE_TCP_LISTEN FAKE_NETSTAT_UNIX_LISTEN
 }