[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-649-g0aeae0e
Shawn Moore
sartak at bestpractical.com
Tue Aug 31 17:31:36 EDT 2010
The branch, 3.9-trunk has been updated
via 0aeae0e5c455e377d25957691b84cf4dbc582984 (commit)
via ca9080518c407b4ef447c8197e01657aca6e299e (commit)
from c59352e90ac22b34944d01458179ae5e89591f96 (commit)
Summary of changes:
lib/RT/Test.pm | 3 +++
t/mail/crypt-gnupg.t | 5 +++--
t/mail/gnupg-bad.t | 6 +++---
t/mail/gnupg-incoming.t | 7 +++----
t/mail/gnupg-outgoing.t | 7 +++----
t/mail/gnupg-realmail.t | 7 +++----
t/mail/gnupg-reverification.t | 7 +++----
t/mail/gnupg-special.t | 6 +++---
t/web/crypt-gnupg.t | 9 +++------
t/web/gnupg-select-keys-on-create.t | 7 +++----
t/web/gnupg-select-keys-on-update.t | 7 +++----
t/web/gnupg-tickyboxes.t | 7 +++----
12 files changed, 36 insertions(+), 42 deletions(-)
- Log -----------------------------------------------------------------
commit ca9080518c407b4ef447c8197e01657aca6e299e
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Tue Aug 31 16:55:13 2010 -0400
Use eval {} to try loading a module instead of eval ''
diff --git a/t/mail/crypt-gnupg.t b/t/mail/crypt-gnupg.t
index 1405f13..2bc9c3c 100644
--- a/t/mail/crypt-gnupg.t
+++ b/t/mail/crypt-gnupg.t
@@ -5,7 +5,7 @@ use warnings;
use RT::Test nodata => 1, tests => 97;
plan skip_all => 'GnuPG required.'
- unless eval 'use GnuPG::Interface; 1';
+ unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
diff --git a/t/mail/gnupg-bad.t b/t/mail/gnupg-bad.t
index a3a2775..636fbfb 100644
--- a/t/mail/gnupg-bad.t
+++ b/t/mail/gnupg-bad.t
@@ -5,7 +5,7 @@ use warnings;
use RT::Test tests => 6;
plan skip_all => 'GnuPG required.'
- unless eval 'use GnuPG::Interface; 1';
+ unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
diff --git a/t/mail/gnupg-incoming.t b/t/mail/gnupg-incoming.t
index 5a841a7..ac59463 100644
--- a/t/mail/gnupg-incoming.t
+++ b/t/mail/gnupg-incoming.t
@@ -5,7 +5,7 @@ use warnings;
use RT::Test tests => 39;
plan skip_all => 'GnuPG required.'
- unless eval 'use GnuPG::Interface; 1';
+ unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
diff --git a/t/mail/gnupg-outgoing.t b/t/mail/gnupg-outgoing.t
index 358459f..e28451e 100644
--- a/t/mail/gnupg-outgoing.t
+++ b/t/mail/gnupg-outgoing.t
@@ -5,7 +5,7 @@ use warnings;
use RT::Test tests => 390;
plan skip_all => 'GnuPG required.'
- unless eval 'use GnuPG::Interface; 1';
+ unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
diff --git a/t/mail/gnupg-realmail.t b/t/mail/gnupg-realmail.t
index 9ee4024..99417cf 100644
--- a/t/mail/gnupg-realmail.t
+++ b/t/mail/gnupg-realmail.t
@@ -5,7 +5,7 @@ use warnings;
use RT::Test tests => 196;
plan skip_all => 'GnuPG required.'
- unless eval 'use GnuPG::Interface; 1';
+ unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
diff --git a/t/mail/gnupg-reverification.t b/t/mail/gnupg-reverification.t
index e2ffbe0..83621f7 100644
--- a/t/mail/gnupg-reverification.t
+++ b/t/mail/gnupg-reverification.t
@@ -5,7 +5,7 @@ use warnings;
use RT::Test tests => 214;
plan skip_all => 'GnuPG required.'
- unless eval 'use GnuPG::Interface; 1';
+ unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
diff --git a/t/mail/gnupg-special.t b/t/mail/gnupg-special.t
index 7e50819..e561beb 100644
--- a/t/mail/gnupg-special.t
+++ b/t/mail/gnupg-special.t
@@ -5,7 +5,7 @@ use warnings;
use RT::Test tests => 11;
plan skip_all => 'GnuPG required.'
- unless eval 'use GnuPG::Interface; 1';
+ unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
diff --git a/t/web/crypt-gnupg.t b/t/web/crypt-gnupg.t
index 56fbad1..d1f351d 100644
--- a/t/web/crypt-gnupg.t
+++ b/t/web/crypt-gnupg.t
@@ -4,15 +4,13 @@ use strict;
use RT::Test tests => 101;
plan skip_all => 'GnuPG required.'
- unless eval 'use GnuPG::Interface; 1';
+ unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
use RT::Action::SendEmail;
-eval 'use GnuPG::Interface; 1' or plan skip_all => 'GnuPG required.';
-
RT::Test->set_mail_catcher;
RT->Config->Set( CommentAddress => 'general at example.com');
diff --git a/t/web/gnupg-select-keys-on-create.t b/t/web/gnupg-select-keys-on-create.t
index 42c9e69..bb56f48 100644
--- a/t/web/gnupg-select-keys-on-create.t
+++ b/t/web/gnupg-select-keys-on-create.t
@@ -5,7 +5,7 @@ use warnings;
use RT::Test tests => 78;
plan skip_all => 'GnuPG required.'
- unless eval 'use GnuPG::Interface; 1';
+ unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
diff --git a/t/web/gnupg-select-keys-on-update.t b/t/web/gnupg-select-keys-on-update.t
index c9f4cbc..dd49b63 100644
--- a/t/web/gnupg-select-keys-on-update.t
+++ b/t/web/gnupg-select-keys-on-update.t
@@ -5,7 +5,7 @@ use warnings;
use RT::Test tests => 85;
plan skip_all => 'GnuPG required.'
- unless eval 'use GnuPG::Interface; 1';
+ unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
diff --git a/t/web/gnupg-tickyboxes.t b/t/web/gnupg-tickyboxes.t
index c5c14aa..b759ca7 100644
--- a/t/web/gnupg-tickyboxes.t
+++ b/t/web/gnupg-tickyboxes.t
@@ -5,7 +5,7 @@ use warnings;
use RT::Test tests => 30;
plan skip_all => 'GnuPG required.'
- unless eval 'use GnuPG::Interface; 1';
+ unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
commit 0aeae0e5c455e377d25957691b84cf4dbc582984
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Tue Aug 31 17:33:43 2010 -0400
Deal with lacking GnuPG::Interface better
Test::More gets really cranky if you plan tests => 5 and then
skip_all.
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 1b7f846..e8c9840 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -139,6 +139,9 @@ sub import {
$class->builder->plan( tests => $args{'tests'} )
unless $args{'tests'} eq 'no_declare';
}
+ elsif ( exists $args{'tests'} ) {
+ # do nothing if they say "tests => undef" - let them make the plan
+ }
else {
$class->builder->no_plan unless $class->builder->has_plan;
}
diff --git a/t/mail/crypt-gnupg.t b/t/mail/crypt-gnupg.t
index 2bc9c3c..237a43b 100644
--- a/t/mail/crypt-gnupg.t
+++ b/t/mail/crypt-gnupg.t
@@ -3,11 +3,12 @@
use strict;
use warnings;
-use RT::Test nodata => 1, tests => 97;
+use RT::Test nodata => 1, tests => undef;
plan skip_all => 'GnuPG required.'
unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
+plan tests => 97;
use File::Spec ();
diff --git a/t/mail/gnupg-bad.t b/t/mail/gnupg-bad.t
index 636fbfb..d0578ae 100644
--- a/t/mail/gnupg-bad.t
+++ b/t/mail/gnupg-bad.t
@@ -2,12 +2,12 @@
use strict;
use warnings;
-use RT::Test tests => 6;
-
+use RT::Test tests => undef;
plan skip_all => 'GnuPG required.'
unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
+plan tests => 6;
use Cwd 'getcwd';
diff --git a/t/mail/gnupg-incoming.t b/t/mail/gnupg-incoming.t
index ac59463..dd31771 100644
--- a/t/mail/gnupg-incoming.t
+++ b/t/mail/gnupg-incoming.t
@@ -2,13 +2,12 @@
use strict;
use warnings;
-use RT::Test tests => 39;
-
+use RT::Test tests => undef;
plan skip_all => 'GnuPG required.'
unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
-
+plan tests => 39;
use File::Temp;
use Cwd 'getcwd';
diff --git a/t/mail/gnupg-outgoing.t b/t/mail/gnupg-outgoing.t
index e28451e..1e8f1d2 100644
--- a/t/mail/gnupg-outgoing.t
+++ b/t/mail/gnupg-outgoing.t
@@ -2,13 +2,12 @@
use strict;
use warnings;
-use RT::Test tests => 390;
-
+use RT::Test tests => undef;
plan skip_all => 'GnuPG required.'
unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
-
+plan tests => 390;
use RT::Action::SendEmail;
use File::Temp qw(tempdir);
diff --git a/t/mail/gnupg-realmail.t b/t/mail/gnupg-realmail.t
index 99417cf..f56452a 100644
--- a/t/mail/gnupg-realmail.t
+++ b/t/mail/gnupg-realmail.t
@@ -2,13 +2,12 @@
use strict;
use warnings;
-use RT::Test tests => 196;
-
+use RT::Test tests => undef;
plan skip_all => 'GnuPG required.'
unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
-
+plan tests => 196;
use Digest::MD5 qw(md5_hex);
diff --git a/t/mail/gnupg-reverification.t b/t/mail/gnupg-reverification.t
index 83621f7..0faed0f 100644
--- a/t/mail/gnupg-reverification.t
+++ b/t/mail/gnupg-reverification.t
@@ -2,13 +2,12 @@
use strict;
use warnings;
-use RT::Test tests => 214;
-
+use RT::Test tests => undef;
plan skip_all => 'GnuPG required.'
unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
-
+plan tests => 214;
use File::Temp qw(tempdir);
my $homedir = tempdir( CLEANUP => 1 );
diff --git a/t/mail/gnupg-special.t b/t/mail/gnupg-special.t
index e561beb..625d7c8 100644
--- a/t/mail/gnupg-special.t
+++ b/t/mail/gnupg-special.t
@@ -2,12 +2,12 @@
use strict;
use warnings;
-use RT::Test tests => 11;
-
+use RT::Test tests => undef;
plan skip_all => 'GnuPG required.'
unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
+plan tests => 11;
use File::Temp qw(tempdir);
my $homedir = tempdir( CLEANUP => 1 );
diff --git a/t/web/crypt-gnupg.t b/t/web/crypt-gnupg.t
index d1f351d..5e02077 100644
--- a/t/web/crypt-gnupg.t
+++ b/t/web/crypt-gnupg.t
@@ -1,13 +1,12 @@
#!/usr/bin/perl -w
use strict;
-use RT::Test tests => 101;
-
+use RT::Test tests => undef;
plan skip_all => 'GnuPG required.'
unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
-
+plan tests => 101;
use RT::Action::SendEmail;
diff --git a/t/web/gnupg-select-keys-on-create.t b/t/web/gnupg-select-keys-on-create.t
index bb56f48..5777d1b 100644
--- a/t/web/gnupg-select-keys-on-create.t
+++ b/t/web/gnupg-select-keys-on-create.t
@@ -2,13 +2,12 @@
use strict;
use warnings;
-use RT::Test tests => 78;
-
+use RT::Test tests => undef;
plan skip_all => 'GnuPG required.'
unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
-
+plan tests => 78;
use RT::Action::SendEmail;
use File::Temp qw(tempdir);
diff --git a/t/web/gnupg-select-keys-on-update.t b/t/web/gnupg-select-keys-on-update.t
index dd49b63..ab99170 100644
--- a/t/web/gnupg-select-keys-on-update.t
+++ b/t/web/gnupg-select-keys-on-update.t
@@ -2,13 +2,12 @@
use strict;
use warnings;
-use RT::Test tests => 85;
-
+use RT::Test tests => undef;
plan skip_all => 'GnuPG required.'
unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
-
+plan tests => 85;
use RT::Action::SendEmail;
use File::Temp qw(tempdir);
diff --git a/t/web/gnupg-tickyboxes.t b/t/web/gnupg-tickyboxes.t
index b759ca7..7087c30 100644
--- a/t/web/gnupg-tickyboxes.t
+++ b/t/web/gnupg-tickyboxes.t
@@ -2,13 +2,12 @@
use strict;
use warnings;
-use RT::Test tests => 30;
-
+use RT::Test tests => undef;
plan skip_all => 'GnuPG required.'
unless eval { require GnuPG::Interface; 1 };
plan skip_all => 'gpg executable is required.'
unless RT::Test->find_executable('gpg');
-
+plan tests => 30;
use RT::Action::SendEmail;
use File::Temp qw(tempdir);
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list