From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 44DE21F803; Thu, 10 Jan 2019 03:26:15 +0000 (UTC) Date: Thu, 10 Jan 2019 03:26:15 +0000 From: Eric Wong To: meta@public-inbox.org Cc: Johannes Berg Subject: [PATCH] t/v2writable.t: force more consistent "git log" output Message-ID: <20190110032615.ghyokl2wrba7ucfq@dcvr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline List-Id: This should probably use lower-level git plumbing, but until then, consistently add a bunch of --no-* options to "git log" to get more consistent output. Noticed-by: Johannes Berg https://public-inbox.org/meta/1538164205.14416.76.camel@sipsolutions.net/ --- t/v2writable.t | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/t/v2writable.t b/t/v2writable.t index c7eeee9..a649a5b 100644 --- a/t/v2writable.t +++ b/t/v2writable.t @@ -201,13 +201,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'); @@ -219,7 +220,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'); -- EW