abstract out create config in tests

diff --git a/t/06_mail_handling.t b/t/06_mail_handling.t
index 9489af01a3d8407ecc81a141ae6ff26511ab9eb0..f0b2b375c9ef6db564e7c8b58daf983751bdfc93 100644 (file)
--- a/t/06_mail_handling.t
+++ b/t/06_mail_handling.t
@@ -28,7 +28,7 @@ use Encode qw(decode encode);
 $SIG{CHLD} = sub {};
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
@@ -38,13 +38,7 @@ my $sendmail_dir = $config{sendmail_dir};
 my $spool_dir = $config{spool_dir};
 my $config_dir = $config{config_dir};
 
-END{
-     if ($ENV{DEBUG}) {
-         diag("spool_dir:   $spool_dir\n");
-         diag("config_dir:   $config_dir\n");
-         diag("sendmail_dir: $sendmail_dir\n");
-     }
-}
+
 
 # We're going to use create mime message to create these messages, and
 # then just send them to receive.

diff --git a/t/07_bugreport.t b/t/07_bugreport.t
index 5dfca0507772dd0c916a50dfbbf7224194bd5cd1..c1438c276888711bb4cab8eec14f00131bf25a50 100644 (file)
--- a/t/07_bugreport.t
+++ b/t/07_bugreport.t
@@ -26,21 +26,12 @@ use DebbugsTest qw(:all);
 
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
 }
 
-# Output some debugging information if there's an error
-END{
-     if ($ENV{DEBUG}) {
-         foreach my $key (keys %config) {
-              diag("$key: $config{$key}\n");
-         }
-     }
-}
-
 # create a bug
 send_message(to=>'submit@bugs.something',
             headers => [To   => 'submit@bugs.something',

diff --git a/t/07_control_limit.t b/t/07_control_limit.t
index 02cfc3747727c796d803e2260268d7061d5be020..1283223a4b3ed35802c87e41c7e89b7a33121eb5 100644 (file)
--- a/t/07_control_limit.t
+++ b/t/07_control_limit.t
@@ -26,7 +26,7 @@ use Data::Dumper;
 $SIG{CHLD} = sub {};
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
@@ -36,13 +36,7 @@ my $sendmail_dir = $config{sendmail_dir};
 my $spool_dir = $config{spool_dir};
 my $config_dir = $config{config_dir};
 
-END{
-     if ($ENV{DEBUG}) {
-         diag("spool_dir:   $spool_dir\n");
-         diag("config_dir:   $config_dir\n");
-         diag("sendmail_dir: $sendmail_dir\n");
-     }
-}
+
 
 # We're going to use create mime message to create these messages, and
 # then just send them to receive.

diff --git a/t/08_pkgreport.t b/t/08_pkgreport.t
index df4861d9d0f22f7cd87e5cdae63c4e8796b8360f..97f331fbc168abfd028ce58a9b75963040a4ac36 100644 (file)
--- a/t/08_pkgreport.t
+++ b/t/08_pkgreport.t
@@ -25,21 +25,12 @@ use DebbugsTest qw(:all);
 
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
 }
 
-# Output some debugging information if there's an error
-END{
-     if ($ENV{DEBUG}) {
-         foreach my $key (keys %config) {
-              diag("$key: $config{$key}\n");
-         }
-     }
-}
-
 # create a bug
 send_message(to=>'submit@bugs.something',
             headers => [To   => 'submit@bugs.something',

diff --git a/t/09_soap.t b/t/09_soap.t
index 4967a9c8a15baff7cf123fd935eb97929754b756..ccd51edc335bd9d254423052919ea9c2889ea19a 100644 (file)
--- a/t/09_soap.t
+++ b/t/09_soap.t
@@ -19,21 +19,12 @@ use Cwd;
 
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
 }
 
-# Output some debugging information if we're debugging
-END{
-     if ($ENV{DEBUG}) {
-         foreach my $key (keys %config) {
-              diag("$key: $config{$key}\n");
-         }
-     }
-}
-
 # create a bug
 send_message(to=>'submit@bugs.something',
             headers => [To   => 'submit@bugs.something',

diff --git a/t/10_expire.t b/t/10_expire.t
index 502feeada5bce56b50828dfe02d834226193cf20..fef4094dd6cf4d1cdbbfb096e4108b1a4f556aec 100644 (file)
--- a/t/10_expire.t
+++ b/t/10_expire.t
@@ -27,7 +27,7 @@ use Data::Dumper;
 $SIG{CHLD} = sub {};
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
@@ -37,13 +37,7 @@ my $sendmail_dir = $config{sendmail_dir};
 my $spool_dir = $config{spool_dir};
 my $config_dir = $config{config_dir};
 
-END{
-     if ($ENV{DEBUG}) {
-         diag("spool_dir:   $spool_dir\n");
-         diag("config_dir:   $config_dir\n");
-         diag("sendmail_dir: $sendmail_dir\n");
-     }
-}
+
 
 # We're going to use create mime message to create these messages, and
 # then just send them to receive.

diff --git a/t/11_blocks.t b/t/11_blocks.t
index 11c765ac5cdaaebf07d69b503eb694db9dd87551..5e277cdb4147ae18e1aa38c82afbae45fa4fbd62 100644 (file)
--- a/t/11_blocks.t
+++ b/t/11_blocks.t
@@ -27,7 +27,7 @@ use Test::WWW::Mechanize;
 $SIG{CHLD} = sub {};
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
@@ -37,13 +37,7 @@ my $sendmail_dir = $config{sendmail_dir};
 my $spool_dir = $config{spool_dir};
 my $config_dir = $config{config_dir};
 
-END{
-     if ($ENV{DEBUG}) {
-         diag("spool_dir:   $spool_dir\n");
-         diag("config_dir:   $config_dir\n");
-         diag("sendmail_dir: $sendmail_dir\n");
-     }
-}
+
 
 # We're going to use create mime message to create these messages, and
 # then just send them to receive.

diff --git a/t/12_merge.t b/t/12_merge.t
index f07b4e65ac0b68e3ea762f00ec01b1bb0d5e2fd7..4857f143967327f4a8e537ac5faf6cb5e207b235 100644 (file)
--- a/t/12_merge.t
+++ b/t/12_merge.t
@@ -26,7 +26,7 @@ use Data::Dumper;
 $SIG{CHLD} = sub {};
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
@@ -36,13 +36,7 @@ my $sendmail_dir = $config{sendmail_dir};
 my $spool_dir = $config{spool_dir};
 my $config_dir = $config{config_dir};
 
-END{
-     if ($ENV{DEBUG}) {
-         diag("spool_dir:   $spool_dir\n");
-         diag("config_dir:   $config_dir\n");
-         diag("sendmail_dir: $sendmail_dir\n");
-     }
-}
+
 
 # We're going to use create mime message to create these messages, and
 # then just send them to receive.

diff --git a/t/13_utf8_mail.t b/t/13_utf8_mail.t
index 7ef4aaffdc98c393d97f5a130a41bf8b52c5d906..8fb49e414b4416659683477e4108f0272e486002 100644 (file)
--- a/t/13_utf8_mail.t
+++ b/t/13_utf8_mail.t
@@ -30,7 +30,7 @@ use Encode qw(decode encode decode_utf8 encode_utf8);
 $SIG{CHLD} = sub {};
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
@@ -40,13 +40,7 @@ my $sendmail_dir = $config{sendmail_dir};
 my $spool_dir = $config{spool_dir};
 my $config_dir = $config{config_dir};
 
-END{
-     if ($ENV{DEBUG}) {
-         diag("spool_dir:   $spool_dir\n");
-         diag("config_dir:   $config_dir\n");
-         diag("sendmail_dir: $sendmail_dir\n");
-     }
-}
+
 
 # We're going to use create mime message to create these messages, and
 # then just send them to receive.

diff --git a/t/14_control_at_submit.t b/t/14_control_at_submit.t
index 6688f53c97aa8d1f78d15aab202d3115098d376a..41c6a03758cd8f7751509e1c30a008e29061f60e 100644 (file)
--- a/t/14_control_at_submit.t
+++ b/t/14_control_at_submit.t
@@ -28,7 +28,7 @@ use Encode qw(decode encode);
 $SIG{CHLD} = sub {};
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
@@ -38,13 +38,7 @@ my $sendmail_dir = $config{sendmail_dir};
 my $spool_dir = $config{spool_dir};
 my $config_dir = $config{config_dir};
 
-END{
-     if ($ENV{DEBUG}) {
-         diag("spool_dir:   $spool_dir\n");
-         diag("config_dir:   $config_dir\n");
-         diag("sendmail_dir: $sendmail_dir\n");
-     }
-}
+
 
 # We're going to use create mime message to create these messages, and
 # then just send them to receive.

diff --git a/t/15_rebuild_indexdb.t b/t/15_rebuild_indexdb.t
index a0ca9100dada19424d930c1d11d00398e1177e81..85d7681015e22e13f5e658e07148356b5c734235 100644 (file)
--- a/t/15_rebuild_indexdb.t
+++ b/t/15_rebuild_indexdb.t
@@ -29,7 +29,7 @@ use Encode qw(decode encode decode_utf8 encode_utf8);
 $SIG{CHLD} = sub {};
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
@@ -39,13 +39,7 @@ my $sendmail_dir = $config{sendmail_dir};
 my $spool_dir = $config{spool_dir};
 my $config_dir = $config{config_dir};
 
-END{
-     if ($ENV{DEBUG}) {
-         diag("spool_dir:   $spool_dir\n");
-         diag("config_dir:   $config_dir\n");
-         diag("sendmail_dir: $sendmail_dir\n");
-     }
-}
+
 
 # We're going to use create mime message to create these messages, and
 # then just send them to receive.

diff --git a/t/18_libravatar_cgi.t b/t/18_libravatar_cgi.t
index 4d20e471329b3f9b07c5f68061a38891400bb4de..ec938cc39c6b914c7045ddea63a4926d5c81cd30 100644 (file)
--- a/t/18_libravatar_cgi.t
+++ b/t/18_libravatar_cgi.t
@@ -16,19 +16,12 @@ my $port = 11344;
 $SIG{CHLD} = sub {};
 our %config;
 eval {
-    %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+    %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
  }
 $ENV{DEBBUGS_CONFIG_FILE}  = "$config{config_dir}/debbugs_config";
-END{
-     if ($ENV{DEBUG}) {
-         diag("spool_dir:   $config{spool_dir}\n");
-         diag("config_dir:   $config{config_dir}\n");
-         diag("sendmail_dir: $config{sendmail_dir}\n");
-     }
-}
 
 my $libravatar_cgi_handler = sub {
     my $fh;

diff --git a/t/lib/DebbugsTest.pm b/t/lib/DebbugsTest.pm
index 603b6ecd35a904f7af49424c831bf6fd09326b5a..6e33399d4e0f6ce0bfefd04a7dbdf586c62bd744 100644 (file)
--- a/t/lib/DebbugsTest.pm
+++ b/t/lib/DebbugsTest.pm
@@ -57,7 +57,8 @@ BEGIN{
 sub create_debbugs_configuration {
      my %param = validate_with(params => \@_,
                               spec   => {debug => {type => BOOLEAN,
-                                                   default => 0,
+                                                   default => exists $ENV{DEBUG}?
+                                                   $ENV{DEBUG}:0,
                                                   },
                                          cleanup => {type => BOOLEAN,
                                                      optional => 1,
@@ -73,6 +74,7 @@ sub create_debbugs_configuration {
      $ENV{DEBBUGS_CONFIG_FILE}  ="$config_dir/debbugs_config";
      $ENV{PERL5LIB} = getcwd();
      $ENV{SENDMAIL_TESTDIR} = $sendmail_dir;
+     eval {
      my $sendmail_tester = getcwd().'/t/sendmail_tester';
      unless (-x $sendmail_tester) {
          die q(t/sendmail_tester doesn't exist or isn't executable. You may be in the wrong directory.);
@@ -119,7 +121,17 @@ END
      }
      system('mkdir','-p',"$spool_dir/incoming");
      system('mkdir','-p',"$spool_dir/lock");
+     eval '
+END{
+     if ($ENV{DEBUG}) {
+         diag("spool_dir:   $spool_dir\n");
+         diag("config_dir:   $config_dir\n",);
+         diag("sendmail_dir: $sendmail_dir\n");
+     }
+}';
 
+     };
+     BAIL_OUT ($@) if ($@);
      return (spool_dir => $spool_dir,
             sendmail_dir => $sendmail_dir,
             config_dir => $config_dir,
@@ -193,6 +205,8 @@ sub send_message{
      }
 }
 
+$SIG{CHLD} = sub {};
+
 {
      package DebbugsTest::HTTPServer;
      use base qw(HTTP::Server::Simple::CGI HTTP::Server::Simple::CGI::Environment);