From c9eb90800b550575b0580aabd37a66a83e2fb0c9 Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Thu, 22 Sep 2022 17:34:22 -0400
Subject: [PATCH] flush logs on other log scanning functions

---
 tests/suites/_mail-functions.sh | 21 +++++++++++++--------
 tests/suites/mail-access.sh     |  3 +--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/tests/suites/_mail-functions.sh b/tests/suites/_mail-functions.sh
index 96140c64..3de85149 100644
--- a/tests/suites/_mail-functions.sh
+++ b/tests/suites/_mail-functions.sh
@@ -358,13 +358,7 @@ EOF
 	return ${x[1]}
 }
 
-check_logs() {
-	local assert="${1:-false}"
-	[ "$1" == "true" -o "$1" == "false" ] && shift
-	local types=($@)
-	[ ${#types[@]} -eq 0 ] && types=(syslog slapd mail)
-	
-	# flush records
+flush_logs() {
 	local pid
 	if [ -e /var/run/rsyslogd.pid ]; then
 		# the pid file won't exist if rsyslogd was started with -iNONE
@@ -373,12 +367,22 @@ check_logs() {
 		pid=$(/usr/bin/pidof rsyslogd)
 	fi
 	if [ "$GITHUB_ACTIONS" = "true" ]; then
-		systemctl restart rsyslogd >>$TEST_OF 2>&1
+		systemctl restart rsyslog >>$TEST_OF 2>&1
 		sleep 5
 	elif [ ! -z "$pid" ]; then
 		kill -HUP $pid >>$TEST_OF 2>&1
 		sleep 2
 	fi
+}
+
+check_logs() {
+	local assert="${1:-false}"
+	[ "$1" == "true" -o "$1" == "false" ] && shift
+	local types=($@)
+	[ ${#types[@]} -eq 0 ] && types=(syslog slapd mail)
+	
+	# flush records
+	flush_logs
 
 	if array_contains syslog ${types[@]}; then
 		detect_syslog_error && $assert &&
@@ -415,6 +419,7 @@ grep_postfix_log() {
 	local msg="$1"
 	local count
 	let count="$MAIL_LOG_LINECOUNT + 1"
+	flush_logs
 	tail --lines=+$count /var/log/mail.log 2>>$TEST_OF | grep -iF "$msg" >/dev/null 2>>$TEST_OF
 	return $?
 }
diff --git a/tests/suites/mail-access.sh b/tests/suites/mail-access.sh
index 908fdc37..b01f39d6 100644
--- a/tests/suites/mail-access.sh
+++ b/tests/suites/mail-access.sh
@@ -307,7 +307,7 @@ test_mailbox_pipe() {
 	local outfile="/tmp/pipedrop.$$.out"
 	cat 2>>$TEST_OF >$cmd <<EOF
 #!/bin/bash
-cat > $outfile
+echo "boo" > $outfile
 EOF
 	chmod 755 $cmd
 	rm -f $outfile
@@ -332,7 +332,6 @@ EOF
 		assert_python_failure $code "$output" SMTPAuthenticationError
 		check_logs
 	else
-		sleep 5
 		if grep_postfix_log "User doesn't exist: |$cmd@"; then
 			# ok
 			check_logs