From 20ddcb02821ff3bf8afd2c2279e0889492c93fd9 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 14 Jun 2019 17:13:04 +0000 Subject: search: require PublicInbox::Inbox ref here No sense in supporting multiple methods of initialization for an internal class. --- t/altid.t | 5 +++-- t/search.t | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 't') diff --git a/t/altid.t b/t/altid.t index 13a44a3b..10bf8c65 100644 --- a/t/altid.t +++ b/t/altid.t @@ -17,6 +17,7 @@ my $tmpdir = tempdir('pi-altid-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $git_dir = "$tmpdir/a.git"; my $alt_file = "$tmpdir/another-nntp.sqlite3"; my $altid = [ "serial:gmane:file=$alt_file" ]; +my $ibx; { my $mm = PublicInbox::Msgmap->new_file($alt_file, 1); @@ -42,14 +43,14 @@ my $altid = [ "serial:gmane:file=$alt_file" ]; $im->done; } { - my $ibx = PublicInbox::Inbox->new({mainrepo => $git_dir}); + $ibx = PublicInbox::Inbox->new({mainrepo => $git_dir}); $ibx->{altid} = $altid; my $rw = PublicInbox::SearchIdx->new($ibx, 1); $rw->index_sync; } { - my $ro = PublicInbox::Search->new($git_dir, $altid); + my $ro = PublicInbox::Search->new($ibx); my $msgs = $ro->query("gmane:1234"); is_deeply([map { $_->mid } @$msgs], ['a@example.com'], 'got one match'); diff --git a/t/search.t b/t/search.t index d4c1e150..a049c931 100644 --- a/t/search.t +++ b/t/search.t @@ -18,7 +18,7 @@ my $ibx = PublicInbox::Inbox->new({ mainrepo => $git_dir }); my ($root_id, $last_id); is(0, system(qw(git init --shared -q --bare), $git_dir), "git init (main)"); -eval { PublicInbox::Search->new($git_dir)->xdb }; +eval { PublicInbox::Search->new($ibx)->xdb }; ok($@, "exception raised on non-existent DB"); my $rw = PublicInbox::SearchIdx->new($ibx, 1); @@ -27,7 +27,7 @@ $ibx->with_umask(sub { $rw->_xdb_release; }); $rw = undef; -my $ro = PublicInbox::Search->new($git_dir); +my $ro = PublicInbox::Search->new($ibx); my $rw_commit = sub { $rw->commit_txn_lazy if $rw; $rw = PublicInbox::SearchIdx->new($ibx, 1); -- cgit v1.2.3-24-ge0c7