X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fcgi.t;h=dc1c8b8a58bd6c09d289732c7f43c0ddd728a721;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=b24bbc4ac5f244f0e66bea26f32c463d35ae2087;hpb=2d51a2accd28465c915f91ab48c7e52a81d87a68;p=public-inbox.git

diff --git a/t/cgi.t b/t/cgi.t
index b24bbc4a..dc1c8b8a 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # FIXME: this test is too slow and most non-CGI-requirements
 # should be moved over to things which use test_psgi
@@ -6,18 +6,14 @@ use strict;
 use warnings;
 use Test::More;
 use Email::MIME;
-use File::Temp qw/tempdir/;
-eval { require IPC::Run };
-plan skip_all => "missing IPC::Run for t/cgi.t" if $@;
-
-use constant CGI => "blib/script/public-inbox.cgi";
-my $tmpdir = tempdir('pi-cgi-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::TestCommon;
+require_mods(qw(Plack::Handler::CGI Plack::Util));
+my ($tmpdir, $for_destroy) = tmpdir();
 my $home = "$tmpdir/pi-home";
 my $pi_home = "$home/.public-inbox";
 my $pi_config = "$pi_home/config";
 my $maindir = "$tmpdir/main.git";
 my $addr = 'test-public@example.com';
-my $cfgpfx = "publicinbox.test";
 
 {
 	is(1, mkdir($home, 0755), "setup ~/ for testing");
@@ -27,21 +23,22 @@ my $cfgpfx = "publicinbox.test";
 	open my $fh, '>', "$maindir/description" or die "open: $!\n";
 	print $fh "test for public-inbox\n";
 	close $fh or die "close: $!\n";
-	my %cfg = (
-		"$cfgpfx.address" => $addr,
-		"$cfgpfx.mainrepo" => $maindir,
-	);
-	while (my ($k,$v) = each %cfg) {
-		is(0, system(qw(git config --file), $pi_config, $k, $v),
-			"setup $k");
-	}
+	open $fh, '>>', $pi_config or die;
+	print $fh <<EOF or die;
+[publicinbox "test"]
+	address = $addr
+	inboxdir = $maindir
+	indexlevel = basic
+EOF
+	close $fh or die "close: $!\n";
 }
 
-use_ok 'PublicInbox::Git';
-use_ok 'PublicInbox::Import';
-use_ok 'Email::MIME';
-my $git = PublicInbox::Git->new($maindir);
-my $im = PublicInbox::Import->new($git, 'test', $addr);
+use_ok 'PublicInbox::Inbox';
+use_ok 'PublicInbox::InboxWritable';
+use_ok 'PublicInbox::Config';
+my $cfg = PublicInbox::Config->new($pi_config);
+my $ibx = $cfg->lookup_name('test');
+my $im = PublicInbox::InboxWritable->new($ibx)->importer;
 
 {
 	local $ENV{HOME} = $home;
@@ -103,8 +100,9 @@ EOF
 	like($res->{head}, qr/^Status: 501 /, "search not-yet-enabled");
 	my $indexed;
 	eval {
+		require DBD::SQLite;
 		require PublicInbox::SearchIdx;
-		my $s = PublicInbox::SearchIdx->new($maindir, 1);
+		my $s = PublicInbox::SearchIdx->new($ibx, 1);
 		$s->index_sync;
 		$indexed = 1;
 	};
@@ -120,6 +118,7 @@ EOF
 		};
 	} else {
 		like($res->{head}, qr/^Status: 501 /, "search not available");
+		SKIP: { skip 'DBD::SQLite not available', 2 };
 	}
 
 	my $have_xml_feed = eval { require XML::Feed; 1 } if $indexed;
@@ -132,16 +131,13 @@ EOF
 		my $p = XML::Feed->parse(\($res->{body}));
 		is($p->format, "Atom", "parsed atom feed");
 		is(scalar $p->entries, 3, "parsed three entries");
+	} else {
+		SKIP: { skip 'DBD::SQLite or XML::Feed missing', 2 };
 	}
 }
 
 done_testing();
 
-sub run_with_env {
-	my ($env, @args) = @_;
-	IPC::Run::run(@args, init => sub { %ENV = (%ENV, %$env) });
-}
-
 sub cgi_run {
 	my %env = (
 		PATH_INFO => $_[0],
@@ -154,7 +150,9 @@ sub cgi_run {
 		HTTP_HOST => 'test.example.com',
 	);
 	my ($in, $out, $err) = ("", "", "");
-	my $rc = run_with_env(\%env, [CGI], \$in, \$out, \$err);
+	my $rdr = { 0 => \$in, 1 => \$out, 2 => \$err };
+	run_script(['.cgi'], \%env, $rdr);
+	die "unexpected error: \$?=$?" if $?;
 	my ($head, $body) = split(/\r\n\r\n/, $out, 2);
-	{ head => $head, body => $body, rc => $rc, err => $err }
+	{ head => $head, body => $body, err => $err }
 }