Remove testsuite scaffolding for verification during execution phase

All signatures are now verified before the execution phase begins.

diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp
index 8d7a3a04f805e94b37a9bdfc018bf18b8e97523f..cf2018d4188612bfa135f5a9678e4f6e0d3d7b48 100644 (file)
--- a/testsuite/lib/gatekeeper.exp
+++ b/testsuite/lib/gatekeeper.exp
@@ -777,39 +777,31 @@ proc analyze_log { base_dir name assess } {
                     exp_continue
                 }
 
-       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:AA|EX|PV)\]\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:AA|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|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|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)\]\
-                verified against ([^\r\n]+)} {
-                    # from verify_keyring, upon success
-                    exp_continue
-                    # tests are not sensitive to this message because it
-                    # 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|PV)\]\
                 gpg verify of directive file failed} {
                     # from verify_keyring, when no keys match
                     set A(gpgv,directive-verify-failed) 1
                     exp_continue
                 }
 
-       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:AA|EX)\]\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[AA\]\
                 gpg verify of upload file [(]([^)]+)\) failed} {
                     # from check_files, when no keys match
                     set A(gpgv,upload-verify-failed) 1