[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-854-g493ec83

[Alex Vandiver]

The branch, 3.9-trunk has been updated
       via  493ec8355b9b1adcfa603f699f3cc2caade28de3 (commit)
      from  63c28f207ca80649bd3dfceead73bc11f931e0d8 (commit)

Summary of changes:
 lib/RT/Test/Web.pm                  |    3 ---
 t/mail/gateway.t                    |    2 +-
 t/mail/gnupg-reverification.t       |    2 +-
 t/web/crypt-gnupg.t                 |    2 +-
 t/web/gnupg-select-keys-on-create.t |    2 +-
 t/web/gnupg-select-keys-on-update.t |    2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 493ec8355b9b1adcfa603f699f3cc2caade28de3
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Dec 13 16:55:26 2010 -0500

    1aa8e01 failed to revert all of33d647e; finish the job

diff --git a/lib/RT/Test/Web.pm b/lib/RT/Test/Web.pm
index 00d7ea3..775e362 100644
--- a/lib/RT/Test/Web.pm
+++ b/lib/RT/Test/Web.pm
@@ -226,9 +226,6 @@ sub next_warning_like {
         }
         $self->{stashed_server_warnings} = \@warnings;
     }
-    else {
-        Test::More::pass( "fake pass to make test number happy " );
-    }
 
     my $warning = shift @{ $self->{stashed_server_warnings} };
     return Test::More::like($warning, $re, $name);
diff --git a/t/mail/gateway.t b/t/mail/gateway.t
index 0ee793a..279bbcd 100644
--- a/t/mail/gateway.t
+++ b/t/mail/gateway.t
@@ -57,7 +57,7 @@ use strict;
 use warnings;
 
 
-use RT::Test config => 'Set( $UnsafeEmailCommands, 1);', tests => 225, actual_server => 1;
+use RT::Test config => 'Set( $UnsafeEmailCommands, 1);', tests => 221, actual_server => 1;
 my ($baseurl, $m) = RT::Test->started_ok;
 
 use RT::Tickets;
diff --git a/t/mail/gnupg-reverification.t b/t/mail/gnupg-reverification.t
index 417944a..03c00e3 100644
--- a/t/mail/gnupg-reverification.t
+++ b/t/mail/gnupg-reverification.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use RT::Test::GnuPG tests => 219, gnupg_options => { passphrase => 'rt-test' };
+use RT::Test::GnuPG tests => 216, gnupg_options => { passphrase => 'rt-test' };
 
 diag "load Everyone group";
 my $everyone;
diff --git a/t/web/crypt-gnupg.t b/t/web/crypt-gnupg.t
index fbd519c..9dd3d5c 100644
--- a/t/web/crypt-gnupg.t
+++ b/t/web/crypt-gnupg.t
@@ -2,7 +2,7 @@
 use strict;
 
 use RT::Test::GnuPG
-  tests         => 103,
+  tests         => 102,
   gnupg_options => {
     passphrase    => 'recipient',
     'trust-model' => 'always',
diff --git a/t/web/gnupg-select-keys-on-create.t b/t/web/gnupg-select-keys-on-create.t
index f6b2a5d..cf27e48 100644
--- a/t/web/gnupg-select-keys-on-create.t
+++ b/t/web/gnupg-select-keys-on-create.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use RT::Test::GnuPG tests => 82, gnupg_options => { passphrase => 'rt-test' };
+use RT::Test::GnuPG tests => 79, gnupg_options => { passphrase => 'rt-test' };
 use RT::Action::SendEmail;
 
 my $queue = RT::Test->load_or_create_queue(
diff --git a/t/web/gnupg-select-keys-on-update.t b/t/web/gnupg-select-keys-on-update.t
index 1c92b48..4842dcd 100644
--- a/t/web/gnupg-select-keys-on-update.t
+++ b/t/web/gnupg-select-keys-on-update.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use RT::Test::GnuPG tests => 87, gnupg_options => { passphrase => 'rt-test' };
+use RT::Test::GnuPG tests => 86, gnupg_options => { passphrase => 'rt-test' };
 
 use RT::Action::SendEmail;
 

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