Merge remote-tracking branch 'origin/danga-bundle'

[public-inbox.git] / t / v2writable.t

diff --git a/t/v2writable.t b/t/v2writable.t
index 44156fe19ebf22cd7b9d886c2774a0614c5c6895..f8ef415acc51061b30fbd006ee491edb74c7c536 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -134,8 +134,8 @@ SKIP: {
        use Net::NNTP;
        use IO::Socket;
        use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
-       eval { require Danga::Socket };
-       skip "Danga::Socket missing $@", 2 if $@;
+       eval { require PublicInbox::DS };
+       skip "PublicInbox::DS missing $@", 2 if $@;
        my $err = "$mainrepo/stderr.log";
        my $out = "$mainrepo/stdout.log";
        my %opts = (
@@ -202,13 +202,14 @@ EOF
 };
 {
        local $ENV{NPROC} = 2;
-       my @before = $git0->qx(qw(log --pretty=oneline));
-       my $before = $git0->qx(qw(log --pretty=raw --raw -r --no-abbrev));
+       my @log = qw(log --no-decorate --no-abbrev --no-notes --no-color);
+       my @before = $git0->qx(@log, qw(--pretty=oneline));
+       my $before = $git0->qx(@log, qw(--pretty=raw --raw -r));
        $im = PublicInbox::V2Writable->new($ibx, 1);
        is($im->{partitions}, 1, 'detected single partition from previous');
        my $smsg = $im->remove($mime, 'test removal');
        $im->done;
-       my @after = $git0->qx(qw(log --pretty=oneline));
+       my @after = $git0->qx(@log, qw(--pretty=oneline));
        my $tip = shift @after;
        like($tip, qr/\A[a-f0-9]+ test removal\n\z/s,
                'commit message propagated to git');
@@ -220,7 +221,7 @@ EOF
        my $srch = $ibx->search->reopen;
        my $mset = $srch->query('m:'.$smsg->mid, { mset => 1});
        is($mset->size, 0, 'no longer found in Xapian');
-       my @log1 = qw(log -1 --pretty=raw --raw -r --no-abbrev --no-renames);
+       my @log1 = (@log, qw(-1 --pretty=raw --raw -r --no-renames));
        is($srch->{over_ro}->get_art($num), undef,
                'removal propagated to Over DB');
 
@@ -246,13 +247,15 @@ EOF
        ok(my $cmts = $im->purge($mime), 'purged message');
        like($cmts->[0], qr/\A[a-f0-9]{40}\z/, 'purge returned current commit');
        $im->done;
+
+       # again
+       is($im->purge($mime), undef, 'no-op returns undef');
 }
 
 {
-       my @warn;
        my $x = 'x'x250;
        my $y = 'y'x250;
-       local $SIG{__WARN__} = sub { push @warn, @_ };
+       local $SIG{__WARN__} = sub {};
        $mime->header_set('Subject', 'long mid');
        $mime->header_set('Message-ID', "<$x>");
        ok($im->add($mime), 'add excessively long Message-ID');