X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=t%2F13_utf8_mail.t;h=b98154e9f015cc16e19b6f900ddaf603799c635f;hb=1c4ce01f78b112c2247a08f1a0dc9efb5ab3adca;hp=be6b6c654f7a657b3d1fa9468c1cc6b7e30a442c;hpb=93d76cad203ea6de6d6b8accd88d5470b9cbb146;p=debbugs.git

diff --git a/t/13_utf8_mail.t b/t/13_utf8_mail.t
index be6b6c6..b98154e 100644
--- a/t/13_utf8_mail.t
+++ b/t/13_utf8_mail.t
@@ -28,25 +28,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.
@@ -56,7 +45,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