From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) 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.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 6C8C71FAE9 for ; Thu, 15 Feb 2018 11:08:45 +0000 (UTC) From: "Eric Wong (Contractor, The Linux Foundation)" To: meta@public-inbox.org Subject: [WIP 07/17] t/import: test for last_object_id insertion Date: Thu, 15 Feb 2018 11:08:30 +0000 Message-Id: <20180215110840.30413-8-e@80x24.org> In-Reply-To: <20180215110840.30413-1-e@80x24.org> References: <20180215105509.GA22409@dcvr> <20180215110840.30413-1-e@80x24.org> List-Id: Check for this before doing the Xapian-based v2 importer. --- t/import.t | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/t/import.t b/t/import.t index fb6238e..92c82b9 100644 --- a/t/import.t +++ b/t/import.t @@ -6,7 +6,10 @@ use Test::More; use PublicInbox::MIME; use PublicInbox::Git; use PublicInbox::Import; -use File::Temp qw/tempdir/; +use PublicInbox::Spawn qw(spawn); +use IO::File; +use Fcntl qw(:DEFAULT); +use File::Temp qw/tempdir tempfile/; my $dir = tempdir('pi-import-XXXXXX', TMPDIR => 1, CLEANUP => 1); is(system(qw(git init -q --bare), $dir), 0, 'git init successful'); @@ -20,10 +23,30 @@ my $mime = PublicInbox::MIME->create( 'Content-Type' => 'text/plain', Subject => 'this is a subject', 'Message-ID' => '', + Date => 'Fri, 02 Oct 1993 00:00:00 +0000', ], body => "hello world\n", ); + +$im->{want_object_id} = 1 if 'v2'; like($im->add($mime), qr/\A:\d+\z/, 'added one message'); + +if ('v2') { + like($im->{last_object_id}, qr/\A[a-f0-9]{40}\z/, 'got last_object_id'); + my @cmd = ('git', "--git-dir=$git->{git_dir}", qw(hash-object --stdin)); + my $in = tempfile(); + print $in $mime->as_string or die "write failed: $!"; + $in->flush or die "flush failed: $!"; + $in->seek(0, SEEK_SET); + my $out = tempfile(); + my $pid = spawn(\@cmd, {}, { 0 => fileno($in), 1 => fileno($out)}); + is(waitpid($pid, 0), $pid, 'waitpid succeeds on hash-object'); + is($?, 0, 'hash-object'); + $out->seek(0, SEEK_SET); + chomp(my $hashed_obj = <$out>); + is($hashed_obj, $im->{last_object_id}, "last_object_id matches exp"); +} + $im->done; my @revs = $git->qx(qw(rev-list HEAD)); is(scalar @revs, 1, 'one revision created'); -- EW