-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
use warnings;
use Test::More;
use Benchmark qw(:all :hireswallclock);
use PublicInbox::Inbox;
-use File::Temp qw/tempdir/;
use Net::NNTP;
my $pi_dir = $ENV{GIANT_PI_DIR};
plan skip_all => "GIANT_PI_DIR not defined for $0" unless $pi_dir;
eval { require PublicInbox::Search };
-my ($host_port, $group, %opts, $s, $pid);
+my ($host_port, $group, %opts, $s, $td, $tmp_obj);
require './t/common.perl';
-END {
- if ($s) {
- $s->print("QUIT\r\n");
- $s->getline;
- $s = undef;
- }
- kill 'TERM', $pid if defined $pid;
-};
-
if (($ENV{NNTP_TEST_URL} || '') =~ m!\Anntp://([^/]+)/([^/]+)\z!) {
($host_port, $group) = ($1, $2);
$host_port .= ":119" unless index($host_port, ':') > 0;
} else {
$group = 'inbox.test.perf.nntpd';
- my $ibx = { mainrepo => $pi_dir, newsgroup => $group };
+ my $ibx = { inboxdir => $pi_dir, newsgroup => $group };
$ibx = PublicInbox::Inbox->new($ibx);
- my $nntpd = 'blib/script/public-inbox-nntpd';
- my $tmpdir = tempdir('perf-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+ my $tmpdir;
+ ($tmpdir, $tmp_obj) = tmpdir();
my $pi_config = "$tmpdir/config";
{
print $fh <<"" or die "print $pi_config: $!";
[publicinbox "test"]
newsgroup = $group
- mainrepo = $pi_dir
+ inboxdir = $pi_dir
address = test\@example.com
close $fh or die "close($pi_config): $!";
}
- %opts = (
- LocalAddr => '127.0.0.1',
- ReuseAddr => 1,
- Proto => 'tcp',
- Listen => 1024,
- );
- my $sock = IO::Socket::INET->new(%opts);
-
+ my $sock = tcp_server();
ok($sock, 'sock created');
- my $cmd = [ $nntpd, '-W0' ];
- $pid = spawn_listener({ PI_CONFIG => $pi_config }, $cmd, [$sock]);
+ my $cmd = [ '-nntpd', '-W0' ];
+ $td = start_script($cmd, { PI_CONFIG => $pi_config }, { 3 => $sock });
$host_port = $sock->sockhost . ':' . $sock->sockport;
}
%opts = (
my $date = $ENV{NEWNEWS_DATE};
unless ($date) {
my (undef, undef, undef, $d, $m, $y) = gmtime(time - 30 * 86400);
- $date = sprintf('%04u%02u%02u', $y + 1900, $m, $d);
+ $date = sprintf('%04u%02u%02u', $y + 1900, $m + 1, $d);
diag "NEWNEWS_DATE undefined, using $date";
}
$t = timeit(1, sub {
});
diag 'newnews took: ' . timestr($t) . " for $n";
+if ($s) {
+ $s->print("QUIT\r\n");
+ $s->getline;
+}
+
+
done_testing();
1;