From a1077d18cb36b0cbdfb9da7138ba302f2090db78 Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Tue, 18 Dec 2018 00:08:46 -0500 Subject: [tests] more test config cleanup --- tests/mod-fastcgi.t | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'tests/mod-fastcgi.t') diff --git a/tests/mod-fastcgi.t b/tests/mod-fastcgi.t index a03360bb..7a00963c 100755 --- a/tests/mod-fastcgi.t +++ b/tests/mod-fastcgi.t @@ -7,22 +7,15 @@ BEGIN { } use strict; -use Test::More tests => 48; +use Test::More tests => 46; use LightyTest; my $tf = LightyTest->new(); my $t; -my $php_child = -1; SKIP: { - skip "PHP already running on port 1026", 1 if $tf->listening_on(1026); - skip "no php binary found", 1 unless $LightyTest::HAVE_PHP; - ok(-1 != ($php_child = $tf->spawnfcgi($ENV{'PHP'}, 1026)), "Spawning php"); -} - -SKIP: { - skip "no PHP running on port 1026", 31 unless $tf->listening_on(1026); + skip "no php binary found", 31 unless $LightyTest::HAVE_PHP; $tf->{CONFIGFILE} = 'fastcgi-10.conf'; ok($tf->start_proc == 0, "Starting lighttpd") or goto cleanup; @@ -261,12 +254,6 @@ EOF ok($tf->stop_proc == 0, "Stopping lighttpd"); } -SKIP: { - skip "PHP not started, cannot stop it", 1 unless $php_child != -1; - ok(0 == $tf->endspawnfcgi($php_child), "Stopping php"); - $php_child = -1; -} - SKIP: { skip "no fcgi-auth, fcgi-responder found", 15 unless (-x $tf->{BASEDIR}."/tests/fcgi-auth" || -x $tf->{BASEDIR}."/tests/fcgi-auth.exe") @@ -392,6 +379,4 @@ exit 0; cleanup: ; -$tf->endspawnfcgi($php_child) if $php_child != -1; - die(); -- cgit v1.2.1