[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.4-111-ga88446da38

[? sunnavy]

The branch, 4.4-trunk has been updated
       via  a88446da3853bd9e60a6811803ba64c217f9806c (commit)
       via  24b4ef9b27ac65fb6c122e81e68f7ec3d9e2213e (commit)
      from  a59bdd9bf2d9277ddf3adc9a85e6753cc98cda8f (commit)

Summary of changes:
 Dockerfile           | 3 +++
 lib/RT/Test/GnuPG.pm | 2 ++
 2 files changed, 5 insertions(+)

- Log -----------------------------------------------------------------
commit 24b4ef9b27ac65fb6c122e81e68f7ec3d9e2213e
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Jun 25 15:06:05 2020 -0400

    Provide an option to skip GnuPG tests
    
    The current check runs if GnuPG::Interface is found, but
    there are cases where gpg 1.4 isn't available and that
    version is currently required. Provide an explicit option
    to skip GnuPG tests for this case.

diff --git a/Dockerfile b/Dockerfile
index 98bafcd6c0..d77111ec6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,4 +9,7 @@ ENV RT_DBA_PASSWORD password
 ENV RT_TEST_DB_HOST=172.17.0.2
 ENV RT_TEST_RT_HOST=172.17.0.3
 
+# Skip gpg tests until we update to gpg 2.2
+ENV SKIP_GPG_TESTS=1
+
 CMD tail -f /dev/null
diff --git a/lib/RT/Test/GnuPG.pm b/lib/RT/Test/GnuPG.pm
index d50c2cada1..c4865c1b52 100644
--- a/lib/RT/Test/GnuPG.pm
+++ b/lib/RT/Test/GnuPG.pm
@@ -64,6 +64,8 @@ sub import {
     my %args  = @_;
     my $t     = $class->builder;
 
+    RT::Test::plan( skip_all => 'ENV SKIP_GPG_TESTS is set to true.' )
+      if $ENV{'SKIP_GPG_TESTS'};
     RT::Test::plan( skip_all => 'GnuPG required.' )
       unless GnuPG::Interface->require;
     RT::Test::plan( skip_all => 'gpg executable is required.' )

commit a88446da3853bd9e60a6811803ba64c217f9806c
Merge: a59bdd9bf2 24b4ef9b27
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Jun 26 03:49:27 2020 +0800

    Merge branch '4.4/skip-gpg-tests-option' into 4.4-trunk


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