X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimport.t;h=e71dd7146354a5a3d85e52d97b4ac68319878671;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=92c82b992e3b9da6524c95ee1dc13822642561a6;hpb=e91932f5bc0ac966fee27913440627fa5447c6c7;p=public-inbox.git

diff --git a/t/import.t b/t/import.t
index 92c82b99..e71dd714 100644
--- a/t/import.t
+++ b/t/import.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -7,10 +7,10 @@ use PublicInbox::MIME;
 use PublicInbox::Git;
 use PublicInbox::Import;
 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);
+use Fcntl qw(:DEFAULT SEEK_SET);
+use File::Temp qw/tempfile/;
+use PublicInbox::TestCommon;
+my ($dir, $for_destroy) = tmpdir();
 
 is(system(qw(git init -q --bare), $dir), 0, 'git init successful');
 my $git = PublicInbox::Git->new($dir);
@@ -27,24 +27,28 @@ my $mime = PublicInbox::MIME->create(
 	],
 	body => "hello world\n",
 );
+my $v2 = require_git(2.6, 1);
 
-$im->{want_object_id} = 1 if 'v2';
+$im->{want_object_info} = 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');
+if ($v2) {
+	my $info = $im->{last_object};
+	like($info->[0], qr/\A[a-f0-9]{40}\z/, 'got last object_id');
+	is($mime->as_string, ${$info->[2]}, 'string matches');
+	is($info->[1], length(${$info->[2]}), 'length matches');
 	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);
+	seek($in, 0, SEEK_SET);
 	my $out = tempfile();
-	my $pid = spawn(\@cmd, {}, { 0 => fileno($in), 1 => fileno($out)});
+	my $pid = spawn(\@cmd, {}, { 0 => $in, 1 => $out });
 	is(waitpid($pid, 0), $pid, 'waitpid succeeds on hash-object');
 	is($?, 0, 'hash-object');
-	$out->seek(0, SEEK_SET);
+	seek($out, 0, SEEK_SET);
 	chomp(my $hashed_obj = <$out>);
-	is($hashed_obj, $im->{last_object_id}, "last_object_id matches exp");
+	is($hashed_obj, $info->[0], "last object_id matches exp");
 }
 
 $im->done;
@@ -87,6 +91,16 @@ isnt($msg->header('Subject'), $mime->header('Subject'), 'subject mismatch');
 $mime->header_set('Message-Id', '<failcheck@example.com>');
 is($im->add($mime, sub { undef }), undef, 'check callback fails');
 is($im->remove($mime), undef, 'message not added, so not removed');
-
+is(undef, $im->checkpoint, 'checkpoint works before ->done');
 $im->done;
+is(undef, $im->checkpoint, 'checkpoint works after ->done');
+$im->checkpoint;
+
+my $nogit = PublicInbox::Git->new("$dir/non-existent/dir");
+eval {
+	my $nope = PublicInbox::Import->new($nogit, 'nope', 'no@example.com');
+	$nope->add($mime);
+};
+ok($@, 'Import->add fails on non-existent dir');
+
 done_testing();