X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Findex-git-times.t;h=ffe9223cf94db88091387309beba63fd98551a0f;hb=402234aa4eaf4732e5e1636099115465ec6e5c15;hp=8f80c8669363d1892984bfa4487e3c1f779a8135;hpb=f344d64066f85dd6737daeb42c94902e1bbfda78;p=public-inbox.git
diff --git a/t/index-git-times.t b/t/index-git-times.t
index 8f80c866..ffe9223c 100644
--- a/t/index-git-times.t
+++ b/t/index-git-times.t
@@ -1,10 +1,12 @@
-# Copyright (C) 2020 all contributors
+#!perl -w
+# Copyright (C) all contributors
# License: AGPL-3.0+
-use Test::More;
+use strict;
+use v5.10.1;
use PublicInbox::TestCommon;
-use PublicInbox::Import;
use PublicInbox::Config;
use PublicInbox::Admin;
+use PublicInbox::Import;
use File::Path qw(remove_tree);
require_mods(qw(DBD::SQLite Search::Xapian));
@@ -14,27 +16,28 @@ my ($tmpdir, $for_destroy) = tmpdir();
local $ENV{PI_CONFIG} = "$tmpdir/cfg";
my $v1dir = "$tmpdir/v1";
my $addr = 'x@example.com';
+my $default_branch = PublicInbox::Import::default_branch;
run_script(['-init', '--indexlevel=medium', 'v1', $v1dir,
'http://example.com/x', $addr])
or die "init failed";
{
- my $data = <<'EOF';
+ my $data = <<"EOF";
blob
mark :1
data 133
-From: timeless
-To: x
+From: timeless
+To: x
Subject: can I haz the time?
-Message-ID: <19700101000000-1234@example.com>
+Message-ID: <19700101000000-1234\@example.com>
plz
-reset refs/heads/master
-commit refs/heads/master
+reset $default_branch
+commit $default_branch
mark :2
-author timeless 749520000 +0100
-committer x 1285977600 -0100
+author timeless 749520000 +0100
+committer x 1285977600 -0100
data 20
can I haz the time?
M 100644 :1 53/256f6177504c2878d3a302ef5090dacf5e752c
@@ -45,7 +48,7 @@ EOF
print $w $data or die;
close $w or die;
my $cmd = ['git', "--git-dir=$v1dir", 'fast-import', '--quiet'];
- PublicInbox::Import::run_die($cmd, undef, { 0 => $r });
+ xsys_e($cmd, undef, { 0 => $r });
}
run_script(['-index', '--skip-docdata', $v1dir]) or die 'v1 index failed';
@@ -60,15 +63,17 @@ my $smsg;
$smsg = $ibx->over->get_art(1);
is($smsg->{ds}, 749520000, 'datestamp from git author time');
is($smsg->{ts}, 1285977600, 'timestamp from git committer time');
- my $res = $ibx->search->query("m:$smsg->{mid}");
- is(scalar @$res, 1, 'got one result for m:');
+ my $mset = $ibx->search->mset("m:$smsg->{mid}");
+ is($mset->size, 1, 'got one result for m:');
+ my $res = $ibx->search->mset_to_smsg($ibx, $mset);
is($res->[0]->{ds}, $smsg->{ds}, 'Xapian stored datestamp');
- $res = $ibx->search->query('d:19931002..19931002');
+ $mset = $ibx->search->mset('d:19931002..19931002');
+ $res = $ibx->search->mset_to_smsg($ibx, $mset);
is(scalar @$res, 1, 'got one result for d:');
is($res->[0]->{ds}, $smsg->{ds}, 'Xapian search on datestamp');
}
SKIP: {
- require_git(2.6, 1) or skip('git 2.6+ required for v2', 10);
+ require_git(2.6, 10);
my $v2dir = "$tmpdir/v2";
run_script(['-convert', $v1dir, $v2dir]) or die 'v2 conversion failed';
@@ -84,9 +89,11 @@ SKIP: {
'v2 datestamp from git author time');
is($v2smsg->{ts}, $smsg->{ts},
'v2 timestamp from git committer time');
- my $res = $ibx->search->query("m:$smsg->{mid}");
+ my $mset = $ibx->search->mset("m:$smsg->{mid}");
+ my $res = $ibx->search->mset_to_smsg($ibx, $mset);
is($res->[0]->{ds}, $smsg->{ds}, 'Xapian stored datestamp');
- $res = $ibx->search->query('d:19931002..19931002');
+ $mset = $ibx->search->mset('d:19931002..19931002');
+ $res = $ibx->search->mset_to_smsg($ibx, $mset);
is(scalar @$res, 1, 'got one result for d:');
is($res->[0]->{ds}, $smsg->{ds}, 'Xapian search on datestamp');
};