diff options
Diffstat (limited to 't')
-rw-r--r-- | t/ds-leak.t | 4 | ||||
-rw-r--r-- | t/indexlevels-mirror-v1.t | 4 | ||||
-rw-r--r-- | t/indexlevels-mirror.t | 29 | ||||
-rw-r--r-- | t/nntpd.t | 2 |
4 files changed, 17 insertions, 22 deletions
diff --git a/t/ds-leak.t b/t/ds-leak.t index 9e3243e9..dd8446dc 100644 --- a/t/ds-leak.t +++ b/t/ds-leak.t @@ -8,7 +8,7 @@ use warnings; use Test::More; use_ok 'PublicInbox::DS'; -subtest('close-on-exec for epoll and kqueue' => sub { +if ('close-on-exec for epoll and kqueue') { use PublicInbox::Spawn qw(spawn); my $pid; my $evfd_re = qr/(?:kqueue|eventpoll)/i; @@ -29,7 +29,7 @@ subtest('close-on-exec for epoll and kqueue' => sub { waitpid($pid, 0); } PublicInbox::DS->Reset; -}); +} SKIP: { # not bothering with BSD::Resource diff --git a/t/indexlevels-mirror-v1.t b/t/indexlevels-mirror-v1.t new file mode 100644 index 00000000..9998a09a --- /dev/null +++ b/t/indexlevels-mirror-v1.t @@ -0,0 +1,4 @@ +# Copyright (C) 2019 all contributors <meta@public-inbox.org> +# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> +$ENV{PI_TEST_VERSION} = 1; +require './t/indexlevels-mirror.t'; diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t index bf0f8018..35974947 100644 --- a/t/indexlevels-mirror.t +++ b/t/indexlevels-mirror.t @@ -9,12 +9,12 @@ use PublicInbox::InboxWritable; use File::Temp qw/tempdir/; require PublicInbox::Admin; require './t/common.perl'; -require_git(2.6); -my $this = (split('/', __FILE__))[-1]; +my $PI_TEST_VERSION = $ENV{PI_TEST_VERSION} || 2; +require_git('2.6') if $PI_TEST_VERSION == 2; foreach my $mod (qw(DBD::SQLite)) { eval "require $mod"; - plan skip_all => "$mod missing for $this" if $@; + plan skip_all => "$mod missing for $0" if $@; } my $path = 'blib/script'; @@ -33,10 +33,11 @@ my $mime = PublicInbox::MIME->create( sub import_index_incremental { my ($v, $level) = @_; - my $tmpdir = tempdir("pi-$this-tmp-XXXXXX", TMPDIR => 1, CLEANUP => 1); + my $this = "pi-$v-$level-indexlevels"; + my $tmpdir = tempdir("$this-tmp-XXXXXX", TMPDIR => 1, CLEANUP => 1); my $ibx = PublicInbox::Inbox->new({ mainrepo => "$tmpdir/testbox", - name => "$this-$v", + name => $this, version => $v, -primary_address => 'test@example.com', indexlevel => $level, @@ -165,24 +166,14 @@ sub import_index_incremental { 'indexlevel detectable by Admin '.$v.$level); } -# we can probably cull some other tests and put full/medium tests, here -for my $level (qw(basic)) { - for my $v (1..2) { - subtest("v$v indexlevel=$level" => sub { - import_index_incremental($v, $level); - }) - } -} +# we can probably cull some other tests +import_index_incremental($PI_TEST_VERSION, 'basic'); SKIP: { require PublicInbox::Search; PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 2; - for my $v (1..2) { - foreach my $l (qw(medium full)) { - subtest("v$v indexlevel=$l" => sub { - import_index_incremental($v, $l); - }); - } + foreach my $l (qw(medium full)) { + import_index_incremental($PI_TEST_VERSION, $l); } } @@ -19,7 +19,7 @@ use Sys::Hostname; require './t/common.perl'; # FIXME: make easier to test both versions -my $version = $ENV{PI_VERSION} || 2; +my $version = $ENV{PI_TEST_VERSION} || 2; require_git('2.6') if $version == 2; my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1); |