From 253484d8c6a78c152517b7d358f7f0a9895695bf Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Mon, 21 Nov 2022 22:32:16 -0600 Subject: [PATCH] Remove testsuite scaffolding for verification during execution phase All signatures are now verified before the execution phase begins. --- testsuite/lib/gatekeeper.exp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp index 8d7a3a0..cf2018d 100644 --- 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 -- 2.25.1