diff options
author | Eric Wong <e@80x24.org> | 2021-03-15 12:57:56 +0100 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-03-15 16:53:59 -0400 |
commit | 09520aabbfc57c687c574a5435054d2c89b08b76 (patch) | |
tree | cbd0f3c9188d372c5757f5ed701adab9a39ff3d2 /t | |
parent | b0f10a882c8c7afb3675c8b7c4a5bf5ca7b3e3b8 (diff) | |
download | public-inbox-09520aabbfc57c687c574a5435054d2c89b08b76.tar.gz |
This barely saves any time due to sqlite3(1) fsync, but does save some lines of code.
Diffstat (limited to 't')
-rw-r--r-- | t/www_altid.t | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/t/www_altid.t b/t/www_altid.t index 784acc8b..7c2b6b21 100644 --- a/t/www_altid.t +++ b/t/www_altid.t @@ -1,10 +1,9 @@ +#!perl -w # Copyright (C) 2020-2021 all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> use strict; -use Test::More; +use v5.10.1; use PublicInbox::TestCommon; -use PublicInbox::Inbox; -use PublicInbox::InboxWritable; use PublicInbox::Config; use PublicInbox::Spawn qw(which spawn); which('sqlite3') or plan skip_all => 'sqlite3 binary missing'; @@ -14,43 +13,35 @@ 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::Eml->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: <a@example.com> 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 <<EOF or die; + $cfgpath = "$ibx->{inboxdir}/cfg"; + open my $fh, '>', $cfgpath or BAIL_OUT "open $cfgpath: $!"; + print $fh <<EOF or BAIL_OUT $!; [publicinbox "test"] - inboxdir = $inboxdir - address = test\@example.com + inboxdir = $ibx->{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,7 +64,7 @@ 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) = tcp_host_port($sock); |