X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fwww_altid.t;h=94a2e807f8d7f3bd4bfd2ad0abf2e03ab34fbf5c;hb=63d7b8ceee55a34cde983e8548d5ce61050d2891;hp=a885c3897c6bbbd7735acc1e9206777d8dba6aea;hpb=6512b1245ebc6fe30bb32227c0ef8f912d4988ab;p=public-inbox.git
diff --git a/t/www_altid.t b/t/www_altid.t
index a885c389..94a2e807 100644
--- a/t/www_altid.t
+++ b/t/www_altid.t
@@ -1,56 +1,45 @@
-# Copyright (C) 2020 all contributors
+#!perl -w
+# Copyright (C) 2020-2021 all contributors
# License: AGPL-3.0+
-use strict;
-use Test::More;
-use PublicInbox::TestCommon;
-use PublicInbox::Inbox;
-use PublicInbox::InboxWritable;
+use strict; use v5.10.1; use PublicInbox::TestCommon;
use PublicInbox::Config;
-use PublicInbox::Spawn qw(which spawn);
-which('sqlite3') or plan skip_all => 'sqlite3 binary missing';
+use PublicInbox::Spawn qw(spawn);
+require_cmd('sqlite3');
require_mods(qw(DBD::SQLite HTTP::Request::Common Plack::Test URI::Escape
Plack::Builder IO::Uncompress::Gunzip));
use_ok($_) for qw(Plack::Test HTTP::Request::Common);
require_ok 'PublicInbox::Msgmap';
require_ok 'PublicInbox::AltId';
require_ok 'PublicInbox::WWW';
-my ($inboxdir, $for_destroy) = tmpdir();
+my ($tmpdir, $for_destroy) = tmpdir();
my $aid = 'xyz';
-my $spec = "serial:$aid:file=blah.sqlite3";
-if ('setup') {
- my $opts = {
- inboxdir => $inboxdir,
- name => 'test',
- -primary_address => 'test@example.com',
- };
- my $ibx = PublicInbox::Inbox->new($opts);
- $ibx = PublicInbox::InboxWritable->new($ibx, 1);
- my $im = $ibx->importer(0);
- my $mime = PublicInbox::MIME->new(<<'EOF');
+my $cfgpath;
+my $ibx = create_inbox 'test', indexlevel => 'basic', sub {
+ my ($im, $ibx) = @_;
+ $im->add(PublicInbox::Eml->new(<<'EOF')) or BAIL_OUT;
From: a@example.com
Message-Id:
EOF
- $im->add($mime);
- $im->done;
- mkdir "$inboxdir/public-inbox" or die;
+ # $im->done;
+ my $spec = "serial:$aid:file=blah.sqlite3";
my $altid = PublicInbox::AltId->new($ibx, $spec, 1);
$altid->mm_alt->mid_set(1, 'a@example.com');
-}
-
-my $cfgpath = "$inboxdir/cfg";
-open my $fh, '>', $cfgpath or die;
-print $fh <{inboxdir}/cfg";
+ open my $fh, '>', $cfgpath or BAIL_OUT "open $cfgpath: $!";
+ print $fh <{inboxdir}
+ address = $ibx->{-primary_address}
altid = $spec
url = http://example.com/test
EOF
-close $fh or die;
+ close $fh or BAIL_OUT $!;
+};
+$cfgpath //= "$ibx->{inboxdir}/cfg";
my $cfg = PublicInbox::Config->new($cfgpath);
my $www = PublicInbox::WWW->new($cfg);
-my $cmpfile = "$inboxdir/cmp.sqlite3";
+my $cmpfile = "$tmpdir/cmp.sqlite3";
my $client = sub {
my ($cb) = @_;
my $res = $cb->(POST("/test/$aid.sql.gz"));
@@ -73,10 +62,10 @@ SKIP: {
require_mods(qw(Plack::Test::ExternalServer), 4);
my $env = { PI_CONFIG => $cfgpath };
my $sock = tcp_server() or die;
- my ($out, $err) = map { "$inboxdir/std$_.log" } qw(out err);
+ my ($out, $err) = map { "$tmpdir/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);
+ my ($h, $p) = tcp_host_port($sock);
local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
Plack::Test::ExternalServer::test_psgi(client => $client);
}