X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_v2.t;h=7ab60adcc46f00f33cec66b2b64ccbeb4903204a;hb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;hp=90a710a4406cf15900558f41336f2c5c4857d6da;hpb=903c74de0b1feae03fdeb8a7ce68b6327699e3a2;p=public-inbox.git
diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index 90a710a4..7ab60adc 100644
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 all contributors
+# Copyright (C) 2018-2021 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
@@ -14,6 +14,40 @@ 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 $!;
+ my $e = do { local $/; <$fh> };
+ if ($e =~ s/^Plack::Middleware::ReverseProxy missing,\n//gms) {
+ $e =~ s/^URL generation for redirects .*\n//gms;
+ }
+ is($e, '', 'no errors');
+ }
+};
+
my $ibx = {
inboxdir => $inboxdir,
name => 'test-v2writable',
@@ -53,14 +87,13 @@ like($$msg, qr/\AFrom oldbug/s,
'"From_" line stored to test old bug workaround');
my $cfgpfx = "publicinbox.v2test";
-my $cfg = <new(\<{-primary_address}
$cfgpfx.inboxdir=$inboxdir
EOF
-my $config = PublicInbox::Config->new(\$cfg);
-my $www = PublicInbox::WWW->new($config);
+my $www = PublicInbox::WWW->new($cfg);
my ($res, $raw, @from_);
-test_psgi(sub { $www->call(@_) }, sub {
+my $client0 = sub {
my ($cb) = @_;
$res = $cb->(GET('/v2test/description'));
like($res->content, qr!\$INBOX_DIR/description missing!,
@@ -90,7 +123,9 @@ test_psgi(sub { $www->call(@_) }, sub {
@bodies = ($res->content =~ /^(hello [^<]+)$/mg);
is_deeply(\@bodies, [ "hello world!\n", "hello world\n" ],
'new.html ordering is chronological');
-});
+};
+test_psgi(sub { $www->call(@_) }, $client0);
+$run_httpd->($client0, 9);
$mime->header_set('Message-Id', 'a-mid@b');
$mime->body_set("hello ghosts\n");
@@ -103,7 +138,7 @@ $mids = mids($mime->header_obj);
my $third = $mids->[-1];
$im->done;
-my $client = sub {
+my $client1 = sub {
my ($cb) = @_;
$res = $cb->(GET("/v2test/$third/raw"));
$raw = $res->content;
@@ -118,7 +153,7 @@ my $client = sub {
like($raw, qr/^hello ghosts$/m, 'got third message');
@from_ = ($raw =~ m/^From /mg);
is(scalar(@from_), 3, 'three From_ lines');
- $config->each_inbox(sub { $_[0]->search->reopen });
+ $cfg->each_inbox(sub { $_[0]->search->reopen });
SKIP: {
eval { require IO::Uncompress::Gunzip };
@@ -196,32 +231,10 @@ my $client = sub {
like($raw, qr/\b3\+ messages\b/, 'thread overview shown');
};
-test_psgi(sub { $www->call(@_) }, $client);
-SKIP: {
- require_mods(qw(Plack::Test::ExternalServer), 37);
- my $cfgpath = "$inboxdir/$$.config";
- 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 $fh, '<', $err or BAIL_OUT $!;
- is(do { local $/; <$fh> }, '', 'no errors');
-};
+test_psgi(sub { $www->call(@_) }, $client1);
+$run_httpd->($client1, 38);
-test_psgi(sub { $www->call(@_) }, sub {
- my ($cb) = @_;
+{
my $exp = [ qw( ) ];
$mime->header_set('Message-Id', @$exp);
$mime->header_set('Subject', '4th dupe');
@@ -230,10 +243,12 @@ test_psgi(sub { $www->call(@_) }, sub {
$im->done;
my @h = $mime->header('Message-ID');
is_deeply($exp, \@h, 'reused existing Message-ID');
+ $cfg->each_inbox(sub { $_[0]->search->reopen });
+}
- $config->each_inbox(sub { $_[0]->search->reopen });
-
- $res = $cb->(GET('/v2test/new.atom'));
+my $client2 = sub {
+ my ($cb) = @_;
+ my $res = $cb->(GET('/v2test/new.atom'));
my @ids = ($res->content =~ m!urn:uuid:([^<]+)!sg);
my %ids;
$ids{$_}++ for @ids;
@@ -256,15 +271,23 @@ test_psgi(sub { $www->call(@_) }, sub {
is($res->code, 200, 'got info refs for dumb clones w/ .git suffix');
$res = $cb->(GET('/v2test/info/refs'));
is($res->code, 404, 'v2 git URL w/o shard fails');
+};
+test_psgi(sub { $www->call(@_) }, $client2);
+$run_httpd->($client2, 8);
+{
# ensure conflicted attachments can be resolved
foreach my $body (qw(old new)) {
$mime = eml_load "t/psgi_v2-$body.eml";
ok($im->add($mime), "added attachment $body");
}
$im->done;
- $config->each_inbox(sub { $_[0]->search->reopen });
- $res = $cb->(GET('/v2test/a@dup/'));
+ $cfg->each_inbox(sub { $_[0]->search->reopen });
+}
+
+my $client3 = sub {
+ my ($cb) = @_;
+ my $res = $cb->(GET('/v2test/a@dup/'));
my @links = ($res->content =~ m!"\.\./([^/]+/2-attach\.txt)\"!g);
is(scalar(@links), 2, 'both attachment links exist');
isnt($links[0], $links[1], 'attachment links are different');
@@ -276,7 +299,12 @@ test_psgi(sub { $www->call(@_) }, sub {
}
$res = $cb->(GET('/v2test/?t=1970'.'01'.'01'.'000000'));
is($res->code, 404, '404 for out-of-range t= param');
-});
+ @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();