From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 548522141C for ; Fri, 4 Jan 2019 13:10:43 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 6/6] t/cgi.t: remove more redundant tests Date: Fri, 4 Jan 2019 13:10:38 +0000 Message-Id: <20190104131038.32233-7-e@80x24.org> In-Reply-To: <20190104131038.32233-1-e@80x24.org> References: <20190104131038.32233-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Most of these test cases are in t/plack.t, already; and that runs much faster. Just ensure the slashy corner case and search stuff works. While we're at it, avoid using the public-inbox-index command and just use the internal API to index. --- t/cgi.t | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/t/cgi.t b/t/cgi.t index e705cd7..aedd79e 100644 --- a/t/cgi.t +++ b/t/cgi.t @@ -12,7 +12,6 @@ eval { require IPC::Run }; plan skip_all => "missing IPC::Run for t/cgi.t" if $@; use constant CGI => "blib/script/public-inbox.cgi"; -my $index = "blib/script/public-inbox-index"; my $tmpdir = tempdir('pi-cgi-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $home = "$tmpdir/pi-home"; my $pi_home = "$home/.public-inbox"; @@ -77,14 +76,9 @@ Me wrote: what? EOF $im->add($reply); - $im->done; -} -# message-id pages -{ - local $ENV{HOME} = $home; my $slashy_mid = 'slashy/asdf@example.com'; - my $reply = Email::MIME->new(<new(< To: Me Cc: $addr @@ -94,30 +88,12 @@ Date: Thu, 01 Jan 1970 00:00:01 +0000 slashy EOF - $im->add($reply); + $im->add($slashy); $im->done; my $res = cgi_run("/test/slashy/asdf\@example.com/raw"); like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/, "slashy mid raw hit"); - - $res = cgi_run("/test/blahblah\@example.com/raw"); - like($res->{body}, qr/Message-Id: /, - "mid raw hit"); - - $res = cgi_run("/test/blahblah\@example.com/"); - like($res->{body}, qr/\A/, "mid html hit"); - like($res->{head}, qr/Status: 200 OK/, "200 response"); - - $res = cgi_run("/test/blahblah\@example.com/f/"); - like($res->{head}, qr/Status: 301 Moved/, "301 response"); - like($res->{head}, - qr!^Location: http://[^/]+/test/blahblah\@example\.com/\r\n!ms, - '301 redirect location'); - - $res = cgi_run("/test/new.html"); - like($res->{body}, qr/slashy%2Fasdf\@example\.com/, - "slashy URL generated correctly"); } # retrieve thread as an mbox @@ -126,7 +102,13 @@ EOF my $path = "/test/blahblah\@example.com/t.mbox.gz"; my $res = cgi_run($path); like($res->{head}, qr/^Status: 501 /, "search not-yet-enabled"); - my $indexed = system($index, $maindir) == 0; + my $indexed; + eval { + require PublicInbox::SearchIdx; + my $s = PublicInbox::SearchIdx->new($maindir, 1); + $s->index_sync; + $indexed = 1; + }; if ($indexed) { $res = cgi_run($path); like($res->{head}, qr/^Status: 200 /, "search returned mbox"); -- EW