X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimport.t;h=703aa36286a2726fef33e3ecaada88b0b59c2139;hb=b5bc3576af3d0ef0fa884ed32a674c7a703a19b2;hp=29d00b058ec5b656827e293ac0b21872450baed9;hpb=3fc59df0d633a17e0c5e43d633d12e8772c06ec3;p=public-inbox.git
diff --git a/t/import.t b/t/import.t
index 29d00b05..703aa362 100644
--- a/t/import.t
+++ b/t/import.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
@@ -6,8 +6,11 @@ use Test::More;
use PublicInbox::MIME;
use PublicInbox::Git;
use PublicInbox::Import;
-use File::Temp qw/tempdir/;
-my $dir = tempdir('pi-import-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::Spawn qw(spawn);
+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);
@@ -20,14 +23,38 @@ 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",
);
-like($im->add($mime), qr/\A:\d+\z/, 'added one message');
+my $v2 = require_git(2.6, 1);
+my $smsg = {} if $v2;
+like($im->add($mime, undef, $smsg), qr/\A:[0-9]+\z/, 'added one message');
+
+if ($v2) {
+ like($smsg->{blob}, qr/\A[a-f0-9]{40}\z/, 'got last object_id');
+ is($mime->as_string, ${$smsg->{-raw_email}}, 'string matches');
+ is($smsg->{bytes}, length(${$smsg->{-raw_email}}), '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: $!";
+ seek($in, 0, SEEK_SET);
+ my $out = tempfile();
+ my $pid = spawn(\@cmd, {}, { 0 => $in, 1 => $out });
+ is(waitpid($pid, 0), $pid, 'waitpid succeeds on hash-object');
+ is($?, 0, 'hash-object');
+ seek($out, 0, SEEK_SET);
+ chomp(my $hashed_obj = <$out>);
+ is($hashed_obj, $smsg->{blob}, "blob object_id matches exp");
+}
+
$im->done;
my @revs = $git->qx(qw(rev-list HEAD));
is(scalar @revs, 1, 'one revision created');
+my $odd = '"=?iso-8859-1?Q?J_K=FCpper?= header_set('From', $odd);
$mime->header_set('Message-ID', '');
$mime->header_set('Subject', 'msg2');
like($im->add($mime, sub { $mime }), qr/\A:\d+\z/, 'added 2nd message');
@@ -64,6 +91,16 @@ isnt($msg->header('Subject'), $mime->header('Subject'), 'subject mismatch');
$mime->header_set('Message-Id', '');
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();