From b5bc3576af3d0ef0fa884ed32a674c7a703a19b2 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 20 Mar 2020 08:18:20 +0000 Subject: *idx: pass smsg in even more places We can finally get rid of the awkward, ad-hoc use of V2Writable, SearchIdx, and OverIdx args for passing {cotime} and {autime} between classes. We'll still use those git time fields internally within V2Writable and SearchIdx for (re)indexing, but that's not worth avoiding as a fallback. --- t/import.t | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 't') diff --git a/t/import.t b/t/import.t index b88d308e..703aa362 100644 --- a/t/import.t +++ b/t/import.t @@ -28,15 +28,13 @@ 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: $!"; @@ -48,7 +46,7 @@ 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; -- cgit v1.2.3-24-ge0c7