X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimport.t;h=cfbe501b102bca5061856ac52609529ed650c37e;hb=e3e9ebdaaf2c2f8192fc003f1857979f933b9a8b;hp=eee47447d3c9fbada1f9addee0f19423551e8cf4;hpb=30a72ab33290a9ce57955bbd0799e394feab91ea;p=public-inbox.git
diff --git a/t/import.t b/t/import.t
index eee47447..cfbe501b 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;
@@ -9,8 +9,9 @@ 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 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,11 +28,12 @@ my $mime = PublicInbox::MIME->create(
],
body => "hello world\n",
);
+my $v2 = require_git(2.6, 1);
-$im->{want_object_info} = 1 if 'v2';
+$im->{want_object_info} = 1 if $v2;
like($im->add($mime), qr/\A:\d+\z/, 'added one message');
-if ('v2') {
+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');
@@ -42,7 +44,7 @@ if ('v2') {
$in->flush or die "flush failed: $!";
$in->seek(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);
@@ -94,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();