X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2mda.t;h=8f2f335d96b8d834cfe5ffd38df13dfc6599595a;hb=5ca29b7f2789517f0a41f1482509f504b8b601e1;hp=7666eb2dacd3a22f2accf7252b1367376af09d1d;hpb=7e782e8ff3ec64500913069a2efb5815fe711a36;p=public-inbox.git
diff --git a/t/v2mda.t b/t/v2mda.t
index 7666eb2d..8f2f335d 100644
--- a/t/v2mda.t
+++ b/t/v2mda.t
@@ -1,7 +1,8 @@
-# Copyright (C) 2018-2020 all contributors
+#!perl -w
+# Copyright (C) all contributors
# License: AGPL-3.0+
+use v5.10.1;
use strict;
-use warnings;
use Test::More;
use Fcntl qw(SEEK_SET);
use Cwd;
@@ -46,11 +47,7 @@ local $ENV{ORIGINAL_RECIPIENT} = 'test@example.com';
ok(run_script(['-mda'], undef, $rdr), 'mda delivered a message');
$ibx = PublicInbox::Inbox->new($ibx);
-
-if ($V == 1) {
- ok(run_script([ '-index', "$tmpdir/inbox" ]), 'v1 indexed');
-}
-my $msgs = $ibx->search->query('');
+my $msgs = $ibx->over->recent;
is(scalar(@$msgs), 1, 'only got one message');
my $eml = $ibx->smsg_eml($msgs->[0]);
is($eml->as_string, $mime->as_string, 'injected message');
@@ -64,7 +61,7 @@ is($eml->as_string, $mime->as_string, 'injected message');
ok(run_script(['-mda'], undef, $rdr), 'mda did not die on "spam"');
@new = glob("$faildir/new/*");
is(scalar(@new), 1, 'got a message in faildir');
- $msgs = $ibx->search->reopen->query('');
+ $msgs = $ibx->over->recent;
is(scalar(@$msgs), 1, 'no new message');
my $config = "$ENV{PI_DIR}/config";
@@ -76,7 +73,7 @@ is($eml->as_string, $mime->as_string, 'injected message');
ok(run_script(['-mda'], undef, $rdr), 'mda did not die');
my @again = glob("$faildir/new/*");
is_deeply(\@again, \@new, 'no new message in faildir');
- $msgs = $ibx->search->reopen->query('');
+ $msgs = $ibx->over->recent;
is(scalar(@$msgs), 2, 'new message added OK');
}
@@ -85,11 +82,18 @@ is($eml->as_string, $mime->as_string, 'injected message');
open my $fh, '<', $patch or die "failed to open $patch: $!\n";
$rdr->{0} = \(do { local $/; <$fh> });
ok(run_script(['-mda'], undef, $rdr), 'mda delivered a patch');
- my $post = $ibx->search->reopen->query('dfpost:6e006fd7');
- is(scalar(@$post), 1, 'got one result for dfpost');
- my $pre = $ibx->search->query('dfpre:090d998');
- is(scalar(@$pre), 1, 'got one result for dfpre');
+ my $post = $ibx->search->reopen->mset('dfpost:6e006fd7');
+ is($post->size, 1, 'got one result for dfpost');
+ my $pre = $ibx->search->mset('dfpre:090d998');
+ is($pre->size, 1, 'got one result for dfpre');
+ $pre = $ibx->search->mset_to_smsg($ibx, $pre);
+ $post = $ibx->search->mset_to_smsg($ibx, $post);
is($post->[0]->{blob}, $pre->[0]->{blob}, 'same message in both cases');
+
+ # git patch-id --stable search->mset("patchid:$patchid");
+ is($mset->size, 1, 'patchid search works');
}
done_testing();