Remove testsuite logic that supported optional processing phase tags

All relevant messages now have phase tags in all cases.

diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp
index c7d4a1c8a57aa8a0075d6e43f08ab4591b86d268..52a7b2623400484312d4ad508bb9083b50532513 100644 (file)
--- a/testsuite/lib/gatekeeper.exp
+++ b/testsuite/lib/gatekeeper.exp
@@ -606,7 +606,7 @@ proc analyze_log { base_dir name assess } {
                     exp_continue
                 }
 
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)(?: \[(?:AA|EX)\])?\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:AA|EX)\]\
                 DEBUG: found keyring [^\r\n]+} {
                     # from keyring_file, while searching for keyrings
                     exp_continue
@@ -770,24 +770,24 @@ proc analyze_log { base_dir name assess } {
                     exp_continue
                 }
 
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)(?: \[(?:AA|EX|PV)\])?\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:AA|EX|PV)\]\
                 DEBUG: [^ ]+ size is [[:digit:]]+} {
                     # from verify_keyring, upon entry
                     # also from check_files, twice, upon entry
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)(?: \[(?:AA|EX|PV)\])?\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:AA|EX|PV)\]\
                 DEBUG: gpgv command line: [^\r\n]+} {
                     # from verify_keyring, tracing gpgv call
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)(?: \[(?:AA|EX|PV)\])?\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:AA|EX|PV)\]\
                 gpgv exited ([[:digit:]]+)} {
                     # from verify_keyring, when closing pipe from gpgv
                     set A(gpgv,exitcode,$expect_out(1,string)) 1
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)(?: \[(?:AA|EX|PV)\])?\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:AA|EX|PV)\]\
                 verified against ([^\r\n]+)} {
                     # from verify_keyring, upon success
                     exp_continue
@@ -795,7 +795,7 @@ proc analyze_log { base_dir name assess } {
                     # is likely to be removed when gpgv is given multiple
                     # keyrings instead of being run repeatedly
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)(?: \[(?:AA|EX|PV)\])?\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:AA|EX|PV)\]\
                 gpg verify of directive file failed} {
                     # from verify_keyring, when no keys match
                     set A(gpgv,directive-verify-failed) 1
@@ -864,41 +864,41 @@ proc analyze_log { base_dir name assess } {
                     exp_continue
                 }
 
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)(?: \[..\])?\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[..\]\
                 \(in [^()]+\) [^\r\n]+} {
                     # from fatal, just before calling ftp_die which exits
                     exp_continue
                 }
 
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)(?: \[(?:RP|EX|AA|PV)\])?\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\
                 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|EX|AA|PV)\]\
                 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|EX|AA|PV)\]\
                 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|EX|AA|PV)\]\
                 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|EX|AA|PV)\]\
                 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|EX|AA|PV)\]\
                 Body: [^\r\n]+} {
                     # from mail, recording outgoing message body
                     exp_continue