X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_v2.t;h=1f19070894571eef0dea0650b06e4718016ea775;hb=1c52f49354aa83e71fcceccae888da0c77f2391d;hp=0ceb26ed8c9bdbaf4b1f15ef550f35c8511864e2;hpb=0d38f65c490466837ae091afa7a7b6f59d04ce7c;p=public-inbox.git diff --git a/t/psgi_v2.t b/t/psgi_v2.t index 0ceb26ed..1f190708 100644 --- a/t/psgi_v2.t +++ b/t/psgi_v2.t @@ -1,8 +1,8 @@ -# Copyright (C) 2018-2020 all contributors +#!perl -w +# Copyright (C) 2018-2021 all contributors # License: AGPL-3.0+ use strict; -use warnings; -use Test::More; +use v5.10.1; use PublicInbox::TestCommon; require_git(2.6); use PublicInbox::Eml; @@ -12,51 +12,8 @@ require_mods(qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test URI::Escape Plack::Builder)); use_ok($_) for (qw(HTTP::Request::Common Plack::Test)); use_ok 'PublicInbox::WWW'; -use_ok 'PublicInbox::V2Writable'; -my ($inboxdir, $for_destroy) = tmpdir(); -my $cfgpath = "$inboxdir/$$.config"; -SKIP: { - require_mods(qw(Plack::Test::ExternalServer), 1); - open my $fh, '>', $cfgpath or BAIL_OUT $!; - print $fh < $cfgpath }; - my $sock = tcp_server() or die; - my ($out, $err) = map { "$inboxdir/std$_.log" } qw(out err); - my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ]; - my $td = start_script($cmd, $env, { 3 => $sock }); - my ($h, $p) = ($sock->sockhost, $sock->sockport); - local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p"; - Plack::Test::ExternalServer::test_psgi(client => $client); - $td->join('TERM'); - open my $fh, '<', $err or BAIL_OUT $!; - is(do { local $/; <$fh> }, '', 'no errors'); - } -}; - -my $ibx = { - inboxdir => $inboxdir, - name => 'test-v2writable', - version => 2, - -primary_address => 'test@example.com', -}; -$ibx = PublicInbox::Inbox->new($ibx); -my $new_mid; - -my $im = PublicInbox::V2Writable->new($ibx, 1); -$im->{parallel} = 0; - -my $mime = PublicInbox::Eml->new(<<'EOF'); +my ($tmpdir, $for_destroy) = tmpdir(); +my $eml = PublicInbox::Eml->new(<<'EOF'); From oldbug-pre-a0c07cba0e5d8b6a Fri Oct 2 00:00:00 1993 From: a@example.com To: test@example.com @@ -66,27 +23,43 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 hello world EOF -ok($im->add($mime), 'added one message'); -$mime->body_set("hello world!\n"); - -my @warn; -local $SIG{__WARN__} = sub { push @warn, @_ }; -$mime->header_set(Date => 'Fri, 02 Oct 1993 00:01:00 +0000'); -ok($im->add($mime), 'added duplicate-but-different message'); -is(scalar(@warn), 1, 'got one warning'); -my $mids = mids($mime->header_obj); -$new_mid = $mids->[1]; -$im->done; +my $new_mid; +my $ibx = create_inbox 'v2', version => 2, indexlevel => 'medium', + tmpdir => "$tmpdir/v2", sub { + my ($im, $ibx) = @_; + $im->add($eml) or BAIL_OUT; + $eml->body_set("hello world!\n"); + my @warn; + local $SIG{__WARN__} = sub { push @warn, @_ }; + $eml->header_set(Date => 'Fri, 02 Oct 1993 00:01:00 +0000'); + $im->add($eml) or BAIL_OUT; + is(scalar(@warn), 1, 'got one warning'); + my $mids = mids($eml->header_obj); + $new_mid = $mids->[1]; + open my $fh, '>', "$ibx->{inboxdir}/new_mid" or BAIL_OUT; + print $fh $new_mid or BAIL_OUT; + close $fh or BAIL_OUT; +}; +$new_mid //= do { + open my $fh, '<', "$ibx->{inboxdir}/new_mid" or BAIL_OUT; + local $/; + <$fh>; +}; +my $cfgpath = "$ibx->{inboxdir}/pi_config"; +{ + open my $fh, '>', $cfgpath or BAIL_OUT $!; + print $fh <{inboxdir} + address = $ibx->{-primary_address} +EOF + close $fh or BAIL_OUT; +} my $msg = $ibx->msg_by_mid('a-mid@b'); like($$msg, qr/\AFrom oldbug/s, '"From_" line stored to test old bug workaround'); - -my $cfgpfx = "publicinbox.v2test"; -my $cfg = PublicInbox::Config->new(\<{-primary_address} -$cfgpfx.inboxdir=$inboxdir -EOF +my $cfg = PublicInbox::Config->new($cfgpath); my $www = PublicInbox::WWW->new($cfg); my ($res, $raw, @from_); my $client0 = sub { @@ -121,16 +94,20 @@ my $client0 = sub { 'new.html ordering is chronological'); }; test_psgi(sub { $www->call(@_) }, $client0); -$run_httpd->($client0, 9); +my $env = { TMPDIR => $tmpdir, PI_CONFIG => $cfgpath }; +test_httpd($env, $client0, 9); -$mime->header_set('Message-Id', 'a-mid@b'); -$mime->body_set("hello ghosts\n"); -ok($im->add($mime), 'added 3rd duplicate-but-different message'); -is(scalar(@warn), 2, 'got another warning'); -like($warn[0], qr/mismatched/, 'warned about mismatched messages'); -is($warn[0], $warn[1], 'both warnings are the same'); - -$mids = mids($mime->header_obj); +$eml->header_set('Message-ID', 'a-mid@b'); +$eml->body_set("hello ghosts\n"); +my $im = $ibx->importer(0); +{ + my @warn; + local $SIG{__WARN__} = sub { push @warn, @_ }; + ok($im->add($eml), 'added 3rd duplicate-but-different message'); + is(scalar(@warn), 1, 'got another warning'); + like($warn[0], qr/mismatched/, 'warned about mismatched messages'); +} +my $mids = mids($eml->header_obj); my $third = $mids->[-1]; $im->done; @@ -228,16 +205,16 @@ my $client1 = sub { }; test_psgi(sub { $www->call(@_) }, $client1); -$run_httpd->($client1, 38); +test_httpd($env, $client1, 38); { my $exp = [ qw( ) ]; - $mime->header_set('Message-Id', @$exp); - $mime->header_set('Subject', '4th dupe'); + $eml->header_set('Message-Id', @$exp); + $eml->header_set('Subject', '4th dupe'); local $SIG{__WARN__} = sub {}; - ok($im->add($mime), 'added one message'); + ok($im->add($eml), 'added one message'); $im->done; - my @h = $mime->header('Message-ID'); + my @h = $eml->header('Message-ID'); is_deeply($exp, \@h, 'reused existing Message-ID'); $cfg->each_inbox(sub { $_[0]->search->reopen }); } @@ -270,16 +247,16 @@ my $client2 = sub { }; test_psgi(sub { $www->call(@_) }, $client2); -$run_httpd->($client2, 8); +test_httpd($env, $client2, 8); { # ensure conflicted attachments can be resolved + local $SIG{__WARN__} = sub {}; foreach my $body (qw(old new)) { - $mime = eml_load "t/psgi_v2-$body.eml"; - ok($im->add($mime), "added attachment $body"); + $im->add(eml_load "t/psgi_v2-$body.eml") or BAIL_OUT; } $im->done; - $cfg->each_inbox(sub { $_[0]->search->reopen }); } +$cfg->each_inbox(sub { $_[0]->search->reopen }); my $client3 = sub { my ($cb) = @_; @@ -295,13 +272,12 @@ my $client3 = sub { } $res = $cb->(GET('/v2test/?t=1970'.'01'.'01'.'000000')); is($res->code, 404, '404 for out-of-range t= param'); - @warn = (); + my @warn = (); + local $SIG{__WARN__} = sub { push @warn, @_ }; $res = $cb->(GET('/v2test/?t=1970'.'01'.'01')); is_deeply(\@warn, [], 'no warnings on YYYYMMDD only'); }; test_psgi(sub { $www->call(@_) }, $client3); -$run_httpd->($client3, 4); - -done_testing(); +test_httpd($env, $client3, 4); -1; +done_testing;