X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Ffilter_rubylang.t;h=817994512125c8baa435fee8169e4cae87e4954a;hb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;hp=7b1da11cddf7ed55f441d23b1428d7179c03f286;hpb=fece7fca6aeac74410a813cffcb0da338017d0ed;p=public-inbox.git

diff --git a/t/filter_rubylang.t b/t/filter_rubylang.t
index 7b1da11c..81799451 100644
--- a/t/filter_rubylang.t
+++ b/t/filter_rubylang.t
@@ -1,10 +1,10 @@
-# Copyright (C) 2017-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2017-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-use Email::MIME;
-use File::Temp qw/tempdir/;
+use PublicInbox::Eml;
+use PublicInbox::TestCommon;
 use_ok 'PublicInbox::Filter::RubyLang';
 
 my $f = PublicInbox::Filter::RubyLang->new;
@@ -17,28 +17,31 @@ keep this
 Unsubscribe: <mailto:ruby-core-request@ruby-lang.org?subject=unsubscribe>
 <http://lists.ruby-lang.org/cgi-bin/mailman/options/ruby-core>
 EOF
-my $mime = Email::MIME->new($msg);
+my $mime = PublicInbox::Eml->new($msg);
 my $ret = $f->delivery($mime);
 is($ret, $mime, "delivery successful");
 is($mime->body, "keep this\n", 'normal message filtered OK');
 
 SKIP: {
-	eval 'require DBD::SQLite';
-	skip 'DBD::SQLite missing for altid mapping', 4 if $@;
+	require_mods('DBD::SQLite', 4);
 	use_ok 'PublicInbox::Inbox';
-	my $git_dir = tempdir('pi-filter_rubylang-XXXXXX',
-				TMPDIR => 1, CLEANUP => 1);
+	my ($git_dir, $for_destroy) = tmpdir();
 	is(mkdir("$git_dir/public-inbox"), 1, "created public-inbox dir");
-	my $altid = [ "serial:ruby-core:file=msgmap.sqlite3" ];
+	my $altid = [
+		# 'serial:ruby-core:file=msgmap.sqlite3' can be used here
+		# for documentation purposes, but Xapian ignores everything
+		# up to and including the '-'
+		'serial:core:file=msgmap.sqlite3'
+	];
 	my $ibx = PublicInbox::Inbox->new({ inboxdir => $git_dir,
 						altid => $altid });
-	$f = PublicInbox::Filter::RubyLang->new(-inbox => $ibx);
+	$f = PublicInbox::Filter::RubyLang->new(ibx => $ibx);
 	$msg = <<'EOF';
 X-Mail-Count: 12
 Message-ID: <a@b>
 
 EOF
-	$mime = Email::MIME->new($msg);
+	$mime = PublicInbox::Eml->new($msg);
 	$ret = $f->delivery($mime);
 	is($ret, $mime, "delivery successful");
 	my $mm = PublicInbox::Msgmap->new($git_dir);
@@ -50,7 +53,7 @@ Message-ID: <b@b>
 
 EOF
 
-	$mime = Email::MIME->new($msg);
+	$mime = PublicInbox::Eml->new($msg);
 	$ret = $f->delivery($mime);
 	is($ret, 100, "delivery rejected without X-Mail-Count");
 }