From aeb27f74e34f9ab49dfad141d54d5db10c515a68 Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Mon, 2 Nov 2020 12:59:59 -0500
Subject: [PATCH] Break out MiaB-LDAP code from _init.sh so _init.sh can be
 shared with cloud-in-a-box

---
 tests/runner.sh                |  1 +
 tests/suites/_init.sh          | 36 --------------------------
 tests/suites/_init_miabldap.sh | 46 ++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 36 deletions(-)
 create mode 100644 tests/suites/_init_miabldap.sh

diff --git a/tests/runner.sh b/tests/runner.sh
index 2f983697..3a817324 100755
--- a/tests/runner.sh
+++ b/tests/runner.sh
@@ -10,6 +10,7 @@ cd "$(dirname $0)"
 
 # load global functions and variables
 . suites/_init.sh
+. suites/_init_miabldap.sh
 
 default_suites=(
 	ldap-connection
diff --git a/tests/suites/_init.sh b/tests/suites/_init.sh
index c2c3ab9d..e0fe26a8 100644
--- a/tests/suites/_init.sh
+++ b/tests/suites/_init.sh
@@ -1,34 +1,19 @@
 # -*- indent-tabs-mode: t; tab-width: 4; -*-
 
-# load useful functions from setup
-. ../setup/functions.sh || exit 1
-. ../setup/functions-ldap.sh || exit 1
-set +eu
-
-# load test suite helper functions
 . lib/all.sh "lib"      || exit 1
-. suites/_ldap-functions.sh || exit 1
-. suites/_mail-functions.sh || exit 1
-. suites/_mgmt-functions.sh || exit 1
 
 # globals - all global variables are UPPERCASE
 ASSETS_DIR="assets"
-MIAB_DIR=".."
 BASE_OUTPUTDIR="$(realpath out)/$(hostname | awk -F. '{print $1}')"
-PYMAIL="./test_mail.py"
 declare -i OVERALL_SUCCESSES=0
 declare -i OVERALL_FAILURES=0
 declare -i OVERALL_SKIPPED=0
 declare -i OVERALL_COUNT=0
 declare -i OVERALL_COUNT_SUITES=0
 
-
 # options
 FAILURE_IS_FATAL=no
 DUMP_FAILED_TESTS_OUTPUT=no
-SKIP_REMOTE_SMTP_TESTS=no
-DETECT_SLAPD_LOG_ERROR_OUTPUT=brief
-DETECT_SYSLOG_ERROR_OUTPUT=normal
 
 # record a list of output files for failed tests
 FAILED_TESTS_MANIFEST="$BASE_OUTPUTDIR/failed_tests_manifest.txt"
@@ -158,24 +143,6 @@ test_skip() {
 	TEST_STATE_MSG+=( "$why" )
 }
 
-skip_test() {
-	# call from within a test to check whether the test will be
-	# skipped
-	#
-	# returns 0 if the current test was skipped in which case your test
-	# function must immediately call 'test_end' and return
-	#
-	if [ "$SKIP_REMOTE_SMTP_TESTS" == "yes" ] &&
-		   array_contains "remote-smtp" "$@";
-	then
-		test_skip "no-smtp-remote option given"
-		return 0
-	fi
-	
-	return 1
-}
-
-
 have_test_failures() {
 	[ "$TEST_STATE" == "FAILURE" ] && return 0
 	return 1
@@ -236,6 +203,3 @@ dump_failed_tests_output() {
 
 mkdir -p "$BASE_OUTPUTDIR"
 
-# load global vars
-. /etc/mailinabox.conf || die "Could not load '/etc/mailinabox.conf'"
-. "${STORAGE_ROOT}/ldap/miab_ldap.conf" || die "Could not load miab_ldap.conf"
diff --git a/tests/suites/_init_miabldap.sh b/tests/suites/_init_miabldap.sh
new file mode 100644
index 00000000..ca16d786
--- /dev/null
+++ b/tests/suites/_init_miabldap.sh
@@ -0,0 +1,46 @@
+# load useful functions from setup
+. ../setup/functions.sh || exit 1
+. ../setup/functions-ldap.sh || exit 1
+set +eu
+
+# load test suite helper functions
+. suites/_ldap-functions.sh || exit 1
+. suites/_mail-functions.sh || exit 1
+. suites/_mgmt-functions.sh || exit 1
+
+
+MIAB_DIR=".."
+PYMAIL="./test_mail.py"
+
+
+# options
+SKIP_REMOTE_SMTP_TESTS=no
+DETECT_SLAPD_LOG_ERROR_OUTPUT=brief
+DETECT_SYSLOG_ERROR_OUTPUT=normal
+
+
+skip_test() {
+	# call from within a test to check whether the test will be
+	# skipped
+	#
+	# returns 0 if the current test was skipped in which case your test
+	# function must immediately call 'test_end' and return
+	#
+	if [ "$SKIP_REMOTE_SMTP_TESTS" == "yes" ] &&
+		   array_contains "remote-smtp" "$@";
+	then
+		test_skip "no-smtp-remote option given"
+		return 0
+	fi
+	
+	return 1
+}
+
+
+
+#
+# load global vars
+#
+
+. /etc/mailinabox.conf || die "Could not load '/etc/mailinabox.conf'"
+. "${STORAGE_ROOT}/ldap/miab_ldap.conf" || die "Could not load miab_ldap.conf"