[Rt-commit] rt branch, 4.4/per-queue-outgoing-encryption-protocol, updated. rt-4.4.4-181-g479daa7b3d

[Dianne Skoll]

The branch, 4.4/per-queue-outgoing-encryption-protocol has been updated
       via  479daa7b3d31ec1e451642de1cc5f02a17a41b9c (commit)
      from  9bd2a2dea0ef7e1c82894ae3f0c4f0574832bc4c (commit)

Summary of changes:
 lib/RT/Test/GnuPG.pm | 9 +++++++++
 lib/RT/Test/SMIME.pm | 9 +++++++++
 2 files changed, 18 insertions(+)

- Log -----------------------------------------------------------------
commit 479daa7b3d31ec1e451642de1cc5f02a17a41b9c
Author: Dianne Skoll <dianne at bestpractical.com>
Date:   Thu Nov 19 17:07:16 2020 -0500

    Add deprecation warnings to RT::Test::GnuPG and RT::Test::SMIME.

diff --git a/lib/RT/Test/GnuPG.pm b/lib/RT/Test/GnuPG.pm
index 7720a5c10e..c6294df9c3 100644
--- a/lib/RT/Test/GnuPG.pm
+++ b/lib/RT/Test/GnuPG.pm
@@ -1,3 +1,8 @@
+# NOTE: This file is deprecated.  Instead of:
+#    use RT::Test::GnuPG ARGS
+# please do:
+#    use RT::Test::Crypt GnuPG => 1, ARGS
+
 # BEGIN BPS TAGGED BLOCK {{{
 #
 # COPYRIGHT:
@@ -409,6 +414,10 @@ END {
         system( 'gpgconf', '--homedir', RT->Config->Get('GnuPGOptions')->{homedir}, '--quiet', '--kill', 'gpg-agent' )
             && warn $!;
     }
+
+    # If we use RT->Deprecated here, it makes tests fail with:
+    # Failed test 'no warnings'
+    print STDERR "\n\nRT::Test::GnuPG is deprecated; please use RT::Test::Crypt GnuPG => 1 instead\n\n";
 }
 
 1;
diff --git a/lib/RT/Test/SMIME.pm b/lib/RT/Test/SMIME.pm
index 25b3a43a2f..2e0e42082e 100644
--- a/lib/RT/Test/SMIME.pm
+++ b/lib/RT/Test/SMIME.pm
@@ -1,3 +1,8 @@
+# NOTE: This file is deprecated.  Instead of:
+#    use RT::Test::SMIME ARGS
+# please do:
+#    use RT::Test::Crypt SMIME => 1, ARGS
+
 # BEGIN BPS TAGGED BLOCK {{{
 #
 # COPYRIGHT:
@@ -160,4 +165,8 @@ sub import_key {
     return;
 }
 
+END {
+    RT->Deprecated(Message => 'RT::Test::SMIME is deprecated; please use RT::Test::Crypt SMIME => 1 instead');
+}
+
 1;

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