X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Fimport.t;h=703aa36286a2726fef33e3ecaada88b0b59c2139;hb=b5bc3576af3d0ef0fa884ed32a674c7a703a19b2;hp=d309eec52de1bb63cbc9739960f2bd7abd4e6718;hpb=dc84f78e4b3c7f5c8384fbf5a6b538ac1826a604;p=public-inbox.git
diff --git a/t/import.t b/t/import.t
index d309eec5..703aa362 100644
--- a/t/import.t
+++ b/t/import.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors
+# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
@@ -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);
@@ -29,33 +28,33 @@ my $mime = PublicInbox::MIME->create(
body => "hello world\n",
);
my $v2 = require_git(2.6, 1);
-
-$im->{want_object_info} = 1 if $v2;
-like($im->add($mime), qr/\A:\d+\z/, 'added one message');
+my $smsg = {} if $v2;
+like($im->add($mime, undef, $smsg), qr/\A:[0-9]+\z/, 'added one message');
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');
+ 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: $!";
- $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");
+ 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');