diff options
| author | Eric Wong <e@80x24.org> | 2019-05-23 09:36:40 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2019-05-23 17:43:50 +0000 |
| commit | 96a27a0a073b61c465240bbbbb05a4c16f67c8d4 (patch) | |
| tree | 6ab703c46757f61782e5d135ebc5ef29826fc868 /t | |
| parent | 646c15c17c323aa80a9a25ca8755720926564ef8 (diff) | |
| download | public-inbox-96a27a0a073b61c465240bbbbb05a4c16f67c8d4.tar.gz | |
In retrospect, introducing V1Writable was unnecessary and InboxWritable->importer is in a better position to abstract away differences between v1 and v2 writers. So teach InboxWritable to initialize inboxes and get rid of V1Writable.
Diffstat (limited to 't')
| -rw-r--r-- | t/cgi.t | 4 | ||||
| -rw-r--r-- | t/indexlevels-mirror.t | 5 | ||||
| -rw-r--r-- | t/init.t | 4 | ||||
| -rw-r--r-- | t/nntpd.t | 15 | ||||
| -rw-r--r-- | t/v2mirror.t | 1 |
5 files changed, 10 insertions, 19 deletions
@@ -41,11 +41,11 @@ my $cfgpfx = "publicinbox.test"; use_ok 'PublicInbox::Git'; use_ok 'PublicInbox::Import'; use_ok 'PublicInbox::Inbox'; -use_ok 'PublicInbox::V1Writable'; +use_ok 'PublicInbox::InboxWritable'; use_ok 'PublicInbox::Config'; my $cfg = PublicInbox::Config->new($pi_config); my $ibx = $cfg->lookup_name('test'); -my $im = PublicInbox::V1Writable->new($ibx); +my $im = PublicInbox::InboxWritable->new($ibx)->importer; { local $ENV{HOME} = $home; diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t index 3dd43238..d124c755 100644 --- a/t/indexlevels-mirror.t +++ b/t/indexlevels-mirror.t @@ -5,6 +5,7 @@ use warnings; use Test::More; use PublicInbox::MIME; use PublicInbox::Inbox; +use PublicInbox::InboxWritable; use File::Temp qw/tempdir/; require './t/common.perl'; require_git(2.6); @@ -38,9 +39,7 @@ sub import_index_incremental { -primary_address => 'test@example.com', indexlevel => $level, }); - my $cls = "PublicInbox::V${v}Writable"; - use_ok $cls; - my $im = $cls->new($ibx, {nproc=>1}); + my $im = PublicInbox::InboxWritable->new($ibx, {nproc=>1})->importer; $mime->header_set('Message-ID', '<m@1>'); ok($im->add($mime), 'first message added'); $im->done; @@ -88,7 +88,7 @@ SKIP: { qw(http://example.com/skip1 skip1@example.com)); is(system(@cmd), 0, "--skip 1"); my $gits = [ glob("$tmpdir/skip1/git/*.git") ]; - is_deeply(["$tmpdir/skip1/git/1.git"], $gits, 'skip OK'); + is_deeply($gits, ["$tmpdir/skip1/git/1.git"], 'skip OK'); } @@ -96,7 +96,7 @@ SKIP: { qw(http://example.com/skip2 skip2@example.com)); is(system(@cmd), 0, "--skip 2"); my $gits = [ glob("$tmpdir/skip2/git/*.git") ]; - is_deeply(["$tmpdir/skip2/git/2.git"], $gits, 'skipping 2 works, too'); + is_deeply($gits, ["$tmpdir/skip2/git/2.git"], 'skipping 2 works, too'); } done_testing(); @@ -9,6 +9,7 @@ foreach my $mod (qw(DBD::SQLite)) { } require PublicInbox::SearchIdx; require PublicInbox::Msgmap; +require PublicInbox::InboxWritable; use Email::Simple; use IO::Socket; use Socket qw(IPPROTO_TCP TCP_NODELAY); @@ -30,9 +31,6 @@ my $group = 'test-nntpd'; my $addr = $group . '@example.com'; my $nntpd = 'blib/script/public-inbox-nntpd'; my $init = 'blib/script/public-inbox-init'; -use_ok 'PublicInbox::Import'; -use_ok 'PublicInbox::Inbox'; -use_ok 'PublicInbox::Git'; SKIP: { skip "git 2.6+ required for V2Writable", 1 if $version == 1; use_ok 'PublicInbox::V2Writable'; @@ -68,15 +66,8 @@ $ibx = PublicInbox::Inbox->new($ibx); 0, 'enabled newsgroup'); my $len; - my $im; - if ($version == 2) { - $im = PublicInbox::V2Writable->new($ibx); - } elsif ($version == 1) { - use_ok 'PublicInbox::V1Writable'; - $im = PublicInbox::V1Writable->new($ibx); - } else { - die "unsupported version: $version"; - } + $ibx = PublicInbox::InboxWritable->new($ibx); + my $im = $ibx->importer; # ensure successful message delivery { diff --git a/t/v2mirror.t b/t/v2mirror.t index 441e36d7..fe05ec4d 100644 --- a/t/v2mirror.t +++ b/t/v2mirror.t @@ -17,6 +17,7 @@ use File::Temp qw/tempdir/; use IO::Socket; use POSIX qw(dup2); use_ok 'PublicInbox::V2Writable'; +use PublicInbox::InboxWritable; use PublicInbox::MIME; use PublicInbox::Config; # FIXME: too much setup |