[Rt-commit] rtir branch, 5.0/fix-tests-for-gpg-2.2, updated. 4.0.1rc1-122-gc1cd46be

[? sunnavy]

The branch, 5.0/fix-tests-for-gpg-2.2 has been updated
       via  c1cd46befcc702ea69808a423b0bdf3ad407f382 (commit)
      from  8894cbcf409228e56fbf4c0603cf6805606f2a32 (commit)

Summary of changes:
 lib/RT/IR/Test/GnuPG.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit c1cd46befcc702ea69808a423b0bdf3ad407f382
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat May 23 01:01:38 2020 +0800

    Ensure that Test::NoWarnings is skipped if skip_all is used
    
    Without it, gpg tests could fail like:
    
    t/gnupg/on-create.t (Wstat: 0 Tests: 1 Failed: 1)
      Failed test:  1
      Parse errors: Bad plan.  You planned 0 tests but ran 1.
    
    The 1 unexpected test is the had_no_warnings in RT::Test
    
    See also 7d55aee8ff in RT.

diff --git a/lib/RT/IR/Test/GnuPG.pm b/lib/RT/IR/Test/GnuPG.pm
index d20ad8cc..c4d81935 100644
--- a/lib/RT/IR/Test/GnuPG.pm
+++ b/lib/RT/IR/Test/GnuPG.pm
@@ -56,11 +56,10 @@ use File::Temp qw(tempdir);
 sub import {
     my $class = shift;
     my %args  = @_;
-    my $t     = $class->builder;
 
-    $t->plan( skip_all => 'GnuPG required.' )
+    RT::Test::plan( skip_all => 'GnuPG required.' )
       unless eval { require GnuPG::Interface; 1 };
-    $t->plan( skip_all => 'gpg executable is required.' )
+    RT::Test::plan( skip_all => 'gpg executable is required.' )
       unless RT::Test->find_executable('gpg');
 
     $class->SUPER::import(%args);

-----------------------------------------------------------------------