X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fmda.t;h=e3c5cdff2603871d52845c4d0dccdc64f0019a69;hb=d9b0f6432682e4ad0a49f7befccde208e4565f1d;hp=759c0b020abc661addd2752787e9c95c62ea0b5c;hpb=0283273a14e1871955f6a9132f4f3f7884ec8a3f;p=public-inbox.git

diff --git a/t/mda.t b/t/mda.t
index 759c0b02..e3c5cdff 100644
--- a/t/mda.t
+++ b/t/mda.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -97,7 +97,7 @@ EOF
 		local $ENV{PATH} = $main_path;
 		ok(run_script(['-mda'], undef, { 0 => \$in }));
 		my $rev = $git->qx(qw(rev-list HEAD));
-		like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
+		like($rev, qr/\A[a-f0-9]{40,64}/, "good revision committed");
 		chomp $rev;
 		my $cmt = $git->cat_file($rev);
 		like($$cmt, qr/^author Me <me\@example\.com> 0 \+0000\n/m,
@@ -261,7 +261,7 @@ Subject: this message will be trained as spam
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 EOF
-	xsys(qw(git config --file), $pi_config, "$cfgpfx.listid", $list_id);
+	xsys(qw(git config --file), $pi_config, "$cfgpfx.listid", uc $list_id);
 	$? == 0 or die "failed to set listid $?";
 	ok(run_script(['-mda'], undef, { 0 => \$in }),
 		'mda OK with List-Id match');
@@ -299,9 +299,17 @@ EOF
 	ok(run_script(['-mda'], undef, $rdr),
 		'mda OK with multiple List-Id matches');
 	$cur = $git->qx(qw(diff HEAD~1..HEAD));
-	like($cur, qr/Message-ID: <2lids\@example>/,
+	like($cur, qr/^\+Message-ID: <2lids\@example>/sm,
 		'multi List-ID match delivered');
 	like($err, qr/multiple List-ID/, 'warned about multiple List-ID');
+
+	# ensure -learn rm works after inbox address is updated
+	($out, $err) = ('', '');
+	xsys(qw(git config --file), $pi_config, "$cfgpfx.address",
+		'updated-address@example.com');
+	ok(run_script(['-learn', 'rm'], undef, $rdr), 'rm-ed via -learn');
+	$cur = $git->qx(qw(diff HEAD~1..HEAD));
+	like($cur, qr/^-Message-ID: <2lids\@example>/sm, 'changed in git');
 }
 
 done_testing();