Merge branch 'don/fix_encoding'

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

diff --git a/t/13_utf8_mail.t b/t/13_utf8_mail.t
index 588598432277c93666fef90aa9cda54043e0263b..2491e14c3b1f67a3382369b0d8bf0e2f2a443184 100644 (file)
--- 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.
 
@@ -22,7 +24,7 @@ use File::Basename qw(dirname basename);
 use lib qw(t/lib);
 use DebbugsTest qw(:all);
 use Data::Dumper;
-use Encode qw(decode encode);
+use Encode qw(decode encode decode_utf8);
 
 # HTTP::Server:::Simple defines a SIG{CHLD} handler that breaks system; undef it here.
 $SIG{CHLD} = sub {};
@@ -129,6 +131,6 @@ eval "use Debbugs::Status qw(read_bug writebug);";
 my $status = read_bug(bug=>1);
 ok($status->{subject} eq 'ütff8 title encoding test','bug 1 retitled');
 ok($status->{severity} eq 'wishlist','bug 1 wishlisted');
-ok(system('sh','-c','[ $(grep "encoding test" '.$spool_dir.'/db-h/01/1.log|grep -v "ütff8"|wc -l) -eq 0 ]') == 0,
+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');