searchidx: release Xapian FDs before spawning git log

[public-inbox.git] / t / search.t

diff --git a/t/search.t b/t/search.t
index 3ec3f304d99644f86315ba744b48920ae74f881d..2685348c9a7950f22cbe188e8a8eac2593850dac 100644 (file)
--- a/t/search.t
+++ b/t/search.t
@@ -7,7 +7,7 @@ eval { require PublicInbox::SearchIdx; };
 plan skip_all => "Xapian missing for search" if $@;
 use File::Temp qw/tempdir/;
 use Email::MIME;
-my $tmpdir = tempdir(CLEANUP => 1);
+my $tmpdir = tempdir('pi-search-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $git_dir = "$tmpdir/a.git";
 my ($root_id, $last_id);
 
@@ -33,10 +33,14 @@ ok($@, "exception raised on non-existent DB");
 }
 
 my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
+$rw->_xdb_acquire;
+$rw->_xdb_release;
+$rw = undef;
 my $ro = PublicInbox::Search->new($git_dir);
 my $rw_commit = sub {
-       $rw = undef;
+       $rw->{xdb}->commit_transaction if $rw && $rw->{xdb};
        $rw = PublicInbox::SearchIdx->new($git_dir, 1);
+       $rw->_xdb_acquire->begin_transaction;
 };
 
 {
@@ -86,6 +90,7 @@ my $rw_commit = sub {
                body => "goodbye forever :<\n");
 
        my $rv;
+       $rw_commit->();
        $root_id = $rw->add_message($root);
        is($root_id, int($root_id), "root_id is an integer: $root_id");
        $last_id = $rw->add_message($last);
@@ -270,10 +275,11 @@ sub filter_mids {
 
 # circular references
 {
+       my $s = 'foo://'. ('Circle' x 15).'/foo';
        my $doc_id = $rw->add_message(Email::MIME->create(
+               header => [ Subject => $s ],
                header_str => [
                        Date => 'Sat, 02 Oct 2010 00:00:01 +0000',
-                       Subject => 'Circle',
                        'Message-ID' => '<circle@a>',
                        'References' => '<circle@a>',
                        'In-Reply-To' => '<circle@a>',
@@ -285,6 +291,28 @@ sub filter_mids {
        my $smsg = $rw->lookup_message('circle@a');
        $smsg->ensure_metadata;
        is($smsg->references, '', "no references created");
+       my $msg = PublicInbox::SearchMsg->load_doc($smsg->{doc});
+       is($s, $msg->mini_mime->header('Subject'), 'long subject not rewritten');
+}
+
+{
+       my $str = eval {
+               my $mbox = 't/utf8.mbox';
+               open(my $fh, '<', $mbox) or die "failed to open mbox: $mbox\n";
+               local $/;
+               <$fh>
+       };
+       $str =~ s/\AFrom [^\n]+\n//s;
+       my $mime = Email::MIME->new($str);
+       my $doc_id = $rw->add_message($mime);
+       ok($doc_id > 0, 'message indexed doc_id with UTF-8');
+       my $smsg = $rw->lookup_message('testmessage@example.com');
+       my $msg = PublicInbox::SearchMsg->load_doc($smsg->{doc});
+
+       # mini_mime technically not valid (I think),
+       # but good enough for displaying HTML:
+       is($mime->header('Subject'), $msg->mini_mime->header('Subject'),
+               'UTF-8 subject preserved');
 }
 
 done_testing();