X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimport.t;h=ecf2c5906854a514e694768efc7e94e97dac49a8;hb=fb0afdaa35d778c237c40b10216c38e360b248b3;hp=4ec3c4f32e2b060a5e22956e734bc6bd4482de08;hpb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;p=public-inbox.git diff --git a/t/import.t b/t/import.t index 4ec3c4f3..ecf2c590 100644 --- a/t/import.t +++ b/t/import.t @@ -7,11 +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); -require './t/common.perl'; +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); @@ -42,12 +41,12 @@ if ($v2) { 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, $info->[0], "last object_id matches exp"); } @@ -96,4 +95,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();