Update tests for new warning messages in gpg 2.4+

bestpractical · Apr 12, 2024 · 8b57491 · 8b57491
1 parent e84269f
commit 8b57491
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/t/security/CVE-2012-4735-incoming-encryption-header.t b/t/security/CVE-2012-4735-incoming-encryption-header.t
@@ -54,13 +54,21 @@ This was _totally_ encrypted.
 EOF
 
     my ($status, $id);
-    warnings_like {
+    {
+        my @warnings;
+        local $SIG{__WARN__} = sub { push @warnings, @_ };
         ($status, $id) = RT::Test->send_via_mailgate($mail);
         ok $id, "created a ticket";
-    } [qr/(?:keyring|keybox) .* created/,
-       qr/Failure during GnuPG data: No data has been found\. The reason is 'Invalid packet found'/,
-       qr/Failure during GnuPG data: No data has been found\. The reason is 'No armored data'/,
-   ];
+
+        like($warnings[0], qr/(?:keyring|keybox) .* created/, 'GnuPG warning');
+        like($warnings[1], qr/Failure during GnuPG data: No data has been found\. The reason is 'Invalid packet found'/, 'GnuPG warning');
+        like($warnings[2], qr/Failure during GnuPG data: No data has been found\. The reason is 'No armored data'/, 'GnuPG warning');
+
+        # GnuPG 2.4.5+ issues another warning for gpg-exit
+        if ( $warnings[3] ) {
+            like($warnings[3], qr/Failure during GnuPG gpg-exit: Failed to gpg-exit/, 'GnuPG warning');
+        }
+    }
 
     my $ticket = RT::Ticket->new( RT->SystemUser );
     $ticket->Load( $id );