X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimport.t;h=d309eec52de1bb63cbc9739960f2bd7abd4e6718;hb=4821798351defce82c102e46d6f5f84f0cdc0e34;hp=ca597720cea45bfe03e005f22c95b64648422aa0;hpb=dca7dc77cdc0ce8b2b1fc440a2a45011b58ba112;p=public-inbox.git
diff --git a/t/import.t b/t/import.t
index ca597720..d309eec5 100644
--- a/t/import.t
+++ b/t/import.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 all contributors
+# Copyright (C) 2016-2019 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
@@ -11,6 +11,7 @@ use IO::File;
use Fcntl qw(:DEFAULT);
use File::Temp qw/tempdir tempfile/;
my $dir = tempdir('pi-import-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+require './t/common.perl';
is(system(qw(git init -q --bare), $dir), 0, 'git init successful');
my $git = PublicInbox::Git->new($dir);
@@ -27,12 +28,16 @@ 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: $!";
@@ -44,7 +49,7 @@ if ('v2') {
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");
+ is($hashed_obj, $info->[0], "last object_id matches exp");
}
$im->done;
@@ -91,4 +96,12 @@ 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();