use Email::Simple;
use IO::Socket;
use Socket qw(IPPROTO_TCP TCP_NODELAY);
-use File::Temp qw/tempdir/;
use Net::NNTP;
use Sys::Hostname;
require './t/common.perl';
my $version = $ENV{PI_TEST_VERSION} || 2;
require_git('2.6') if $version == 2;
-my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
my $home = "$tmpdir/pi-home";
my $err = "$tmpdir/stderr.log";
my $out = "$tmpdir/stdout.log";
my $inboxdir = "$tmpdir/main.git";
my $group = 'test-nntpd';
my $addr = $group . '@example.com';
-my $nntpd = 'blib/script/public-inbox-nntpd';
-my $init = 'blib/script/public-inbox-init';
SKIP: {
skip "git 2.6+ required for V2Writable", 1 if $version == 1;
use_ok 'PublicInbox::V2Writable';
my %opts;
my $sock = tcp_server();
-my $pid;
+my $td;
my $len;
-END { kill 'TERM', $pid if defined $pid };
my $ibx = {
inboxdir => $inboxdir,
$ibx = PublicInbox::Inbox->new($ibx);
{
local $ENV{HOME} = $home;
- my @cmd = ($init, $group, $inboxdir, 'http://example.com/', $addr);
+ my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr);
push @cmd, "-V$version", '-Lbasic';
- is(system(@cmd), 0, 'init OK');
+ ok(run_script(\@cmd), 'init OK');
is(system(qw(git config), "--file=$home/.public-inbox/config",
"publicinbox.$group.newsgroup", $group),
0, 'enabled newsgroup');
}
ok($sock, 'sock created');
- my $cmd = [ $nntpd, "--stdout=$out", "--stderr=$err" ];
- $pid = spawn_listener(undef, $cmd, [ $sock ]);
- ok(defined $pid, 'forked nntpd process successfully');
+ my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+ $td = start_script($cmd, undef, { 3 => $sock });
my $host_port = $sock->sockhost . ':' . $sock->sockport;
my $n = Net::NNTP->new($host_port);
my $list = $n->list;
is($? >> 8, 0, 'no errors');
}
SKIP: {
- my @of = `lsof -p $pid 2>/dev/null`;
+ my @of = `lsof -p $td->{pid} 2>/dev/null`;
skip('lsof broken', 1) if (!scalar(@of) || $?);
my @xap = grep m!Search/Xapian!, @of;
is_deeply(\@xap, [], 'Xapian not loaded in nntpd');
setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1);
syswrite($s, 'HDR List-id 1-');
select(undef, undef, undef, 0.15);
- ok(kill('TERM', $pid), 'killed nntpd');
+ ok($td->kill, 'killed nntpd');
select(undef, undef, undef, 0.15);
syswrite($s, "\r\n");
$buf = '';
}
$n = $s = undef;
- is($pid, waitpid($pid, 0), 'nntpd exited successfully');
+ $td->join;
my $eout = eval {
local $/;
open my $fh, '<', $err or die "open $err failed: $!";
unlike($eout, qr/wide/i, 'no Wide character warnings');
}
+$td = undef;
done_testing();
sub read_til_dot {