use Sys::Hostname;
use POSIX qw(_exit);
use Digest::SHA;
+use_ok 'PublicInbox::Msgmap';
-# FIXME: make easier to test both versions
+# t/nntpd-v2.t wraps this for v2
my $version = $ENV{PI_TEST_VERSION} || 1;
require_git('2.6') if $version == 2;
my $lsof = which('lsof');
my $inboxdir = "$tmpdir/main.git";
my $group = 'test-nntpd';
my $addr = $group . '@example.com';
-SKIP: {
- skip "git 2.6+ required for V2Writable", 1 if $version == 1;
- use_ok 'PublicInbox::V2Writable';
-}
my %opts;
my $sock = tcp_server();
$ibx = PublicInbox::Inbox->new($ibx);
{
local $ENV{HOME} = $home;
- my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr);
- push @cmd, "-V$version", '-Lbasic';
+ my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr,
+ "-V$version", '-Lbasic', '--newsgroup', $group);
ok(run_script(\@cmd), 'init OK');
- is(xsys(qw(git config), "--file=$home/.public-inbox/config",
- "publicinbox.$group.newsgroup", $group),
- 0, 'enabled newsgroup');
- my $len;
+ my $len;
$ibx = PublicInbox::InboxWritable->new($ibx);
my $im = $ibx->importer(0);
is_deeply($n->head(1), $n->head('<nntp@example.com>'), 'HEAD OK');
is_deeply($n->body(1), $n->body('<nntp@example.com>'), 'BODY OK');
+ is_deeply($n->nntpstat(1), '<nntp@example.com>', 'STAT');
is($n->body(1)->[0], "This is a test message for El\xc3\xa9anor\n",
'body really matches');
my $art = $n->article(1);
'article did not exist');
$im->add($ex);
$im->done;
- ok(run_script([qw(-index --reindex -c), $ibx->{inboxdir}],
+ {
+ my $f = $ibx->mm->{dbh}->sqlite_db_filename;
+ my $tmp = "$tmpdir/tmp.sqlite3";
+ $ibx->mm->{dbh}->sqlite_backup_to_file($tmp);
+ delete $ibx->{mm};
+ rename($tmp, $f) or BAIL_OUT "rename($tmp, $f): $!";
+ }
+ ok(run_script([qw(-index -c -j0 --reindex), $ibx->{inboxdir}],
undef, $noerr), '-compacted');
select(undef, undef, undef, $fast_idle ? 0.1 : 2.1);
$art = $n->article($ex->header('Message-ID'));
sub test_watch {
my ($tmpdir, $sock, $group) = @_;
- use_ok 'PublicInbox::WatchMaildir';
+ use_ok 'PublicInbox::Watch';
use_ok 'PublicInbox::InboxIdle';
+ use_ok 'PublicInbox::Config';
require_git('1.8.5', 1) or skip('git 1.8.5+ needed for --urlmatch', 4);
my $old_env = { HOME => $ENV{HOME} };
my $home = "$tmpdir/watch_home";