X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimport.t;h=3f308299148f4e20ff8b947fc17bc68b4808ecf6;hb=0283273a14e1871955f6a9132f4f3f7884ec8a3f;hp=ecf2c5906854a514e694768efc7e94e97dac49a8;hpb=fb0afdaa35d778c237c40b10216c38e360b248b3;p=public-inbox.git
diff --git a/t/import.t b/t/import.t
index ecf2c590..3f308299 100644
--- a/t/import.t
+++ b/t/import.t
@@ -1,9 +1,9 @@
-# Copyright (C) 2016-2019 all contributors
+# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
use PublicInbox::Git;
use PublicInbox::Import;
use PublicInbox::Spawn qw(spawn);
@@ -12,31 +12,27 @@ 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);
-
my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
-my $mime = PublicInbox::MIME->create(
- header => [
- From => 'a@example.com',
- To => 'b@example.com',
- 'Content-Type' => 'text/plain',
- Subject => 'this is a subject',
- 'Message-ID' => '',
- Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
- ],
- body => "hello world\n",
-);
-my $v2 = require_git(2.6, 1);
+$im->init_bare;
+my $mime = PublicInbox::Eml->new(<<'EOF');
+From: a@example.com
+To: b@example.com
+Subject: this is a subject
+Message-ID:
+Date: Fri, 02 Oct 1993 00:00:00 +0000
-$im->{want_object_info} = 1 if $v2;
-like($im->add($mime), qr/\A:\d+\z/, 'added one message');
+hello world
+EOF
+
+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) {
- 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: $!";
@@ -48,13 +44,15 @@ if ($v2) {
is($?, 0, 'hash-object');
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');
@@ -77,7 +75,7 @@ $im->done;
is(scalar @revs, 26, '26 revisions exist after mass import');
my ($mark, $msg) = $im->remove($mime);
like($mark, qr/\A:\d+\z/, 'got mark');
-is(ref($msg), 'PublicInbox::MIME', 'got old message deleted');
+like(ref($msg), qr/\bPublicInbox::(?:Eml|MIME)\b/, 'got old message deleted');
is(undef, $im->remove($mime), 'remove is idempotent');