X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fplack.t;h=ec45b02cc7297ec213ea44fbe8a0d58f00b928fd;hb=d62d98b9a7f502da65673f0b83a6d06312c060d9;hp=7e65ad742e8f03ccc9102668fb1b3d09a5a5b37f;hpb=3c39f9c942a6975245fda878e9b957d8d3367662;p=public-inbox.git

diff --git a/t/plack.t b/t/plack.t
index 7e65ad74..ec45b02c 100644
--- a/t/plack.t
+++ b/t/plack.t
@@ -4,18 +4,14 @@ use strict;
 use warnings;
 use Test::More;
 use Email::MIME;
-use File::Temp qw/tempdir/;
+use PublicInbox::TestCommon;
 my $psgi = "./examples/public-inbox.psgi";
-my $tmpdir = tempdir('pi-plack-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $pi_config = "$tmpdir/config";
 my $maindir = "$tmpdir/main.git";
 my $addr = 'test-public@example.com';
-my $cfgpfx = "publicinbox.test";
 my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape);
-foreach my $mod (@mods) {
-	eval "require $mod";
-	plan skip_all => "$mod missing for plack.t" if $@;
-}
+require_mods(@mods);
 use_ok 'PublicInbox::Import';
 use_ok 'PublicInbox::Git';
 my @ls;
@@ -27,16 +23,15 @@ foreach my $mod (@mods) { use_ok $mod; }
 	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.url" => 'http://example.com/test/',
-		"$cfgpfx.newsgroup" => 'inbox.test',
-	);
-	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
+	url = http://example.com/test/
+	newsgroup = inbox.test
+EOF
+	close $fh or die;
 
 	# ensure successful message delivery
 	{
@@ -54,9 +49,9 @@ EOF
 		my $im = PublicInbox::Import->new($git, 'test', $addr);
 		$im->add($mime);
 		$im->done;
-		my $rev = `git --git-dir="$maindir" rev-list HEAD`;
+		my $rev = $git->qx(qw(rev-list HEAD));
 		like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
-		@ls = `git --git-dir="$maindir" ls-tree -r --name-only HEAD`;
+		@ls = $git->qx(qw(ls-tree -r --name-only HEAD));
 		chomp @ls;
 	}
 	my $app = eval {