make Plack optional for non-WWW and non-httpd users

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

diff --git a/t/cgi.t b/t/cgi.t
index 3c09ecd619f6214379a3cb5f7bc6aa63b514b8de..5760596ca66cda6fcf61f734f41a6c04da6615f4 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -6,15 +6,14 @@ use strict;
 use warnings;
 use Test::More;
 use Email::MIME;
-use File::Temp qw/tempdir/;
-require './t/common.perl';
-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");
@@ -24,19 +23,16 @@ 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.inboxdir" => $maindir,
-               "$cfgpfx.indexlevel" => 'basic',
-       );
-       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 'PublicInbox::Inbox';
 use_ok 'PublicInbox::InboxWritable';
 use_ok 'PublicInbox::Config';