searchidx: store the primary MID in doc data for NNTP

[public-inbox.git] / t / v2writable.t

diff --git a/t/v2writable.t b/t/v2writable.t
index bc2437a89cc63d1e8e795c0280eaabf3d2083a47..bf8ae5e6c563514b5def130ea1b0810a4e06b6aa 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -53,8 +53,8 @@ ok($im->add($mime), 'ordinary message added');
        ok($im->add($mime), 'reused mid ok');
        like(join(' ', @warn), qr/reused/, 'warned about reused MID');
        my @mids = $mime->header_obj->header_raw('Message-Id');
-       is($mids[0], '<a-mid@b>', 'original mid not changed');
-       like($mids[1], qr/\A<\w+\@localhost>\z/, 'new MID added');
+       is($mids[1], '<a-mid@b>', 'original mid not changed');
+       like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
        is(scalar(@mids), 2, 'only one new MID added');
 
        @warn = ();
@@ -68,8 +68,8 @@ ok($im->add($mime), 'ordinary message added');
        ok($im->add($mime), 'random MID made');
        like(join(' ', @warn), qr/using random/, 'warned about using random');
        @mids = $mime->header_obj->header_raw('Message-Id');
-       is($mids[0], '<a-mid@b>', 'original mid not changed');
-       like($mids[1], qr/\A<\w+\@localhost>\z/, 'new MID added');
+       is($mids[1], '<a-mid@b>', 'original mid not changed');
+       like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
        is(scalar(@mids), 2, 'only one new MID added');
 
        @warn = ();
@@ -80,5 +80,91 @@ ok($im->add($mime), 'ordinary message added');
        is(scalar(@mids), 1, 'new generated');
 }
 
-$im->done;
+{
+       $mime->header_set('Message-Id', '<abcde@1>', '<abcde@2>');
+       ok($im->add($mime), 'message with multiple Message-ID');
+       $im->done;
+       my @found;
+       $ibx->search->each_smsg_by_mid('abcde@1', sub { push @found, @_; 1 });
+       is(scalar(@found), 1, 'message found by first MID');
+       $ibx->search->each_smsg_by_mid('abcde@2', sub { push @found, @_; 1 });
+       is(scalar(@found), 2, 'message found by second MID');
+       is($found[0]->{doc_id}, $found[1]->{doc_id}, 'same document');
+       ok($found[1]->{doc_id} > 0, 'doc_id is positive');
+}
+
+SKIP: {
+       use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD);
+       use Net::NNTP;
+       use IO::Socket;
+       use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
+       eval { require Danga::Socket };
+       skip "Danga::Socket missing $@", 2 if $@;
+       my $err = "$mainrepo/stderr.log";
+       my $out = "$mainrepo/stdout.log";
+       my %opts = (
+               LocalAddr => '127.0.0.1',
+               ReuseAddr => 1,
+               Proto => 'tcp',
+               Type => SOCK_STREAM,
+               Listen => 1024,
+       );
+       my $group = 'inbox.comp.test.v2writable';
+       my $pi_config = "$mainrepo/pi_config";
+       open my $fh, '>', $pi_config or die "open: $!\n";
+       print $fh <<EOF
+[publicinbox "test-v2writable"]
+       mainrepo = $mainrepo
+       version = 2
+       address = test\@example.com
+       newsgroup = $group
+EOF
+       ;
+       close $fh or die "close: $!\n";
+       my $sock = IO::Socket::INET->new(%opts);
+       ok($sock, 'sock created');
+       my $pid;
+       my $len;
+       END { kill 'TERM', $pid if defined $pid };
+       $! = 0;
+       my $fl = fcntl($sock, F_GETFD, 0);
+       ok(! $!, 'no error from fcntl(F_GETFD)');
+       is($fl, FD_CLOEXEC, 'cloexec set by default (Perl behavior)');
+       $pid = fork;
+       if ($pid == 0) {
+               use POSIX qw(dup2);
+               $ENV{PI_CONFIG} = $pi_config;
+               # pretend to be systemd
+               fcntl($sock, F_SETFD, $fl &= ~FD_CLOEXEC);
+               dup2(fileno($sock), 3) or die "dup2 failed: $!\n";
+               $ENV{LISTEN_PID} = $$;
+               $ENV{LISTEN_FDS} = 1;
+               my $nntpd = 'blib/script/public-inbox-nntpd';
+               exec $nntpd, "--stdout=$out", "--stderr=$err";
+               die "FAIL: $!\n";
+       }
+       ok(defined $pid, 'forked nntpd process successfully');
+       $! = 0;
+       fcntl($sock, F_SETFD, $fl |= FD_CLOEXEC);
+       ok(! $!, 'no error from fcntl(F_SETFD)');
+       my $host_port = $sock->sockhost . ':' . $sock->sockport;
+       my $n = Net::NNTP->new($host_port);
+       $n->group($group);
+       my $x = $n->xover('1-');
+       my %uniq;
+       foreach my $num (sort { $a <=> $b } keys %$x) {
+               my $mid = $x->{$num}->[3];
+               is($uniq{$mid}++, 0, "MID for $num is unique in XOVER");
+               is_deeply($n->xhdr('Message-ID', $num),
+                        { $num => $mid }, "XHDR lookup OK on num $num");
+               is_deeply($n->xhdr('Message-ID', $mid),
+                        { $mid => $mid }, "XHDR lookup OK on MID $num");
+       }
+       my %nn;
+       foreach my $mid (@{$n->newnews(0, $group)}) {
+               is($nn{$mid}++, 0, "MID is unique in NEWNEWS");
+       }
+       is_deeply([sort keys %nn], [sort keys %uniq]);
+};
+
 done_testing();