From 1dba9c13d1fe7da661dbab884504da9a3f0d993c Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Mon, 21 Nov 2022 22:16:32 -0600 Subject: [PATCH] Remove testsuite logic that supported email outside of report phase All email messages are now sent during the report phase. --- testsuite/lib/gatekeeper.exp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp index 1313e1b..8d78a64 100644 --- a/testsuite/lib/gatekeeper.exp +++ b/testsuite/lib/gatekeeper.exp @@ -856,35 +856,35 @@ proc analyze_log { base_dir name assess } { exp_continue } - -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\ + -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\ No uploader e-mail address\(es\) to report this error to!} { # from mail, when no email address is provided set A(mail,no-known-address) 1 exp_continue } - -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\ + -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\ NOMAIL is set - not sending email to [^\r\n]+} { # from mail, when mail is inhibited set A(mail,inhibited) 1 exp_continue } - -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\ + -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\ Sending email to [^\r\n]+} { # from mail, recording address list set A(mail,addresses) 1 exp_continue } - -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\ + -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\ Subject: [^\r\n]+} { # from mail, outgoing Subject line exp_continue } - -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\ + -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\ Error uploading package: [^\r\n]+} { # from mail, when a generic failure is reported exp_continue } - -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\ + -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\ Body: [^\r\n]+} { # from mail, recording outgoing message body exp_continue -- 2.25.1