abstract out create config in tests

[debbugs.git] / t / 13_utf8_mail.t

diff --git a/t/13_utf8_mail.t b/t/13_utf8_mail.t
index be6b6c654f7a657b3d1fa9468c1cc6b7e30a442c..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.
@@ -56,7 +50,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