X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=t%2F13_utf8_mail.t;h=d5397dc9a5e492d5c77e12d37c86cff05d43b508;hb=87e2076e141611d821edff91d883fb9e8af5291b;hp=8ada76ab01b05a225987cd86c7e8947e357b23ab;hpb=31ab1899c89be7bdafb7626b8f1fb3fff5ef5838;p=debbugs.git

diff --git a/t/13_utf8_mail.t b/t/13_utf8_mail.t
index 8ada76a..d5397dc 100644
--- a/t/13_utf8_mail.t
+++ b/t/13_utf8_mail.t
@@ -6,6 +6,8 @@ use Test::More tests => 12;
 use warnings;
 use strict;
 
+use utf8;
+
 # Here, we're going to shoot messages through a set of things that can
 # happen.
 
@@ -51,7 +53,7 @@ END{
 
 send_message(to=>'submit@bugs.something',
 	     headers => [To   => 'submit@bugs.something',
-			 From => 'foo@bugs.something',
+			 From => 'foöff@bugs.something',
 			 Subject => 'Submiting a bug',
 			],
 	     body => <<EOF,attachments => [{Type=>"text/plain",Charset=>"utf-8",Data=><<EOF2}]) or fail('Unable to send message');
@@ -89,7 +91,7 @@ $SD_SIZE =
 
 send_message(to => '1@bugs.something',
 	     headers => [To   => '1@bugs.something',
-			 From => 'foo@bugs.something',
+			 From => 'föoff@bugs.something',
 			 Subject => 'Sending a message to a bug',
 			],
 	     body => <<EOF) or fail('sending message to 1@bugs.someting failed');
@@ -107,7 +109,7 @@ $SD_SIZE =
 # just check to see that control doesn't explode
 send_message(to => 'control@bugs.something',
 	     headers => [To   => 'control@bugs.something',
-			 From => 'foo@bugs.something',
+			 From => 'föoff@bugs.something',
 			 Subject => 'Munging a bug',
 			],
 	     body => <<EOF) or fail 'message to control@bugs.something failed';
@@ -127,7 +129,7 @@ ok(system('sh','-c','find '.$sendmail_dir.q( -type f | xargs grep -q "Subject: P
 # This is an eval because $ENV{DEBBUGS_CONFIG_FILE} isn't set at BEGIN{} time
 eval "use Debbugs::Status qw(read_bug writebug);";
 my $status = read_bug(bug=>1);
-ok($status->{subject} eq decode_utf8('ütff8 title encoding test'),'bug 1 retitled');
+ok($status->{subject} eq 'ütff8 title encoding test','bug 1 retitled');
 ok($status->{severity} eq 'wishlist','bug 1 wishlisted');
 ok(system('sh','-c','[ $(egrep "retitle.*encoding test" '.$spool_dir.'/db-h/01/1.log|grep -v "=C3=BCt=EF=AC=808"|wc -l) -eq 0 ]') == 0,
    'Control messages escaped properly');