X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=t%2F15_rebuild_indexdb.t;h=6f6aa212fb580e6369e3959253f974ebffcef9d7;hb=ee73b48c52cedb53381b6c0291693fa1e2a66d2c;hp=a3036ecb297dd655a8817510fa5c08a64d4a5e0a;hpb=dda4ac413007e12639f709e8e1a41c3583e78e36;p=debbugs.git

diff --git a/t/15_rebuild_indexdb.t b/t/15_rebuild_indexdb.t
index a3036ec..6f6aa21 100644
--- a/t/15_rebuild_indexdb.t
+++ b/t/15_rebuild_indexdb.t
@@ -27,25 +27,14 @@ use Encode qw(decode encode decode_utf8 encode_utf8);
 
 # HTTP::Server:::Simple defines a SIG{CHLD} handler that breaks system; undef it here.
 $SIG{CHLD} = sub {};
-my %config;
-eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
-};
-if ($@) {
-     BAIL_OUT($@);
-}
+my %config = create_debbugs_configuration();
+
 
 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.
@@ -55,7 +44,7 @@ send_message(to=>'submit@bugs.something',
 			 From => 'föoff@bugs.something',
 			 Subject => 'Submiting a bug',
 			],
-	     body => <<EOF,attachments => [{Type=>"text/plain",Charset=>"utf-8",Data=><<EOF2}]) or fail('Unable to send message');
+	     body => <<EOF,attachments => [{Type=>"text/plain",Charset=>"utf-8",Data=>encode_utf8(<<EOF2)}]) or fail('Unable to send message');
 Package: foo
 Severity: normal