From ba85b6fd7bd32403766b39c74ab2d5baf6004179 Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Thu, 10 Sep 2020 16:35:19 -0400
Subject: [PATCH] Ignore named connection reset error and reduce reported slapd
 log output

---
 tests/suites/_init.sh           |  2 ++
 tests/suites/_mail-functions.sh | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/suites/_init.sh b/tests/suites/_init.sh
index 25d8afe1..bb0d351a 100644
--- a/tests/suites/_init.sh
+++ b/tests/suites/_init.sh
@@ -27,6 +27,8 @@ declare -i OVERALL_COUNT_SUITES=0
 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"
diff --git a/tests/suites/_mail-functions.sh b/tests/suites/_mail-functions.sh
index 685282d7..cc02ae1d 100644
--- a/tests/suites/_mail-functions.sh
+++ b/tests/suites/_mail-functions.sh
@@ -101,6 +101,7 @@ detect_syslog_error() {
 		let ec=0 # error count
 		let wc=0 # warning count
 		while read line; do
+			# named[7940]: dispatch 0x7f460c02c3a0: shutting down due to TCP receive error: 199.249.112.1#53: connection reset
 			awk '
 /status=(bounced|deferred|undeliverable)/  { exit 1 }
 /warning:/ && /spamhaus\.org: RBL lookup error:/ { exit 2 }
@@ -109,6 +110,7 @@ detect_syslog_error() {
 /Error in /			{ exit 1 }
 /Exception on /     { exit 1 }
 /named\[\d+\]:.* verify failed/ { exit 1 }
+/named\[\d+\]:.* receive error: .*: connection reset/ { exit 2 }
 ' \
 				>>$TEST_OF 2>&1 <<< "$line"
 			if [ $? -eq 1 ]; then
@@ -118,7 +120,9 @@ detect_syslog_error() {
 				let wc+=1
 				record "$F_WARN[ WARN] $line$F_RESET"
 			else
-				record "[   OK] $line"
+				if [ "$DETECT_SYSLOG_ERROR_OUTPUT" != "brief" ]; then
+					record "[   OK] $line"
+				fi
 			fi
 		done
 		[ $ec -gt 0 ] && exit 0
@@ -177,7 +181,9 @@ detect_slapd_log_error() {
 			elif [ $r -eq 3 ]; then
 				let ignored+=1
 			else
-				record "[   OK] $line"
+				if [ "$DETECT_SLAPD_LOG_ERROR_OUTPUT" != "brief" ]; then
+					record "[   OK] $line"
+				fi
 			fi
 		done
 		record "$ignored unreported/ignored log lines"