X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Ffilter_rubylang.t;h=8215b6f109e8323728cfa2f897ed5dd35f39f477;hb=99ba1517d9a636d72b014c3d89f176575bdfcc59;hp=9ed6684b804a68f5859358331d5d9e8ada6eecce;hpb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;p=public-inbox.git

diff --git a/t/filter_rubylang.t b/t/filter_rubylang.t
index 9ed6684b..8215b6f1 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-2020 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::TestCommon;
 use_ok 'PublicInbox::Filter::RubyLang';
 
 my $f = PublicInbox::Filter::RubyLang->new;
@@ -23,14 +23,17 @@ 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 $ibx = PublicInbox::Inbox->new({ mainrepo => $git_dir,
+	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);
 	$msg = <<'EOF';