Browse Source

[tests] mod_ssi tests moved to src/t/test_mod_ssi

remove mod_ssi Perl tests now performed by src/t/test_mod_ssi
master
Glenn Strauss 2 months ago
parent
commit
adf2f816df
  1. 6
      tests/docroot/Makefile.am
  2. 1
      tests/docroot/exec-date.shtml
  3. 5
      tests/docroot/ssi-include.shtml
  4. 1
      tests/docroot/ssi-include.txt
  5. 1
      tests/docroot/ssi.shtml
  6. 5
      tests/lighttpd.conf
  7. 1
      tests/prepare.sh
  8. 29
      tests/request.t

6
tests/docroot/Makefile.am

@ -3,10 +3,6 @@ EXTRA_DIST=\
404.html \
404.pl \
cgi.pl \
exec-date.shtml \
index.html \
index.txt \
prefix.fcgi \
ssi-include.shtml \
ssi-include.txt \
ssi.shtml
prefix.fcgi

1
tests/docroot/exec-date.shtml

@ -1 +0,0 @@
<!--#exec cmd="expr 1 + 1"-->

5
tests/docroot/ssi-include.shtml

@ -1,5 +0,0 @@
<!--#echo var=SCRIPT_NAME-->
<!--#echo var='SCRIPT_NAME'-->
<!--#echo var="SCRIPT_NAME"-->
<!--#include virtual="ssi-include.txt" -->
<!--#include file="ssi-include.txt" -->

1
tests/docroot/ssi-include.txt

@ -1 +0,0 @@
ssi-include

1
tests/docroot/ssi.shtml

@ -1 +0,0 @@
<!--#echo var="SCRIPT_NAME" -->

5
tests/lighttpd.conf

@ -25,7 +25,6 @@ server.modules = (
"mod_simple_vhost",
"mod_cgi",
"mod_userdir",
"mod_ssi",
"mod_status",
"mod_secdownload",
"mod_deflate",
@ -36,10 +35,6 @@ index-file.names = (
"index.html",
)
ssi.extension = (
".shtml",
)
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
mimetype.assign = (

1
tests/prepare.sh

@ -31,7 +31,6 @@ mkdir -p "${tmpdir}/servers/www.example.org/pages/" \
cp "${srcdir}/docroot/"*.html \
"${srcdir}/docroot/"*.pl \
"${srcdir}/docroot/"*.fcgi \
"${srcdir}/docroot/"*.shtml \
"${srcdir}/docroot/"*.txt \
"${tmpdir}/servers/www.example.org/pages/"
cp "${srcdir}/lighttpd.user" "${tmpdir}/"

29
tests/request.t

@ -8,7 +8,7 @@ BEGIN {
use strict;
use IO::Socket;
use Test::More tests => 179;
use Test::More tests => 176;
use LightyTest;
my $tf = LightyTest->new();
@ -1823,31 +1823,4 @@ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'BAR2
ok($tf->handle_http($t) == 0, 'query set-response-header');
## mod_ssi
$t->{REQUEST} = ( <<EOF
GET /ssi.shtml HTTP/1.0
EOF
);
$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => "/ssi.shtml\n" } ];
ok($tf->handle_http($t) == 0, 'ssi - echo ');
## bug #280
$t->{REQUEST} = ( <<EOF
GET /exec-date.shtml HTTP/1.0
EOF
);
$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => "2\n\n" } ];
ok($tf->handle_http($t) == 0, 'ssi - echo ');
$t->{REQUEST} = ( <<EOF
GET /ssi-include.shtml HTTP/1.0
EOF
);
$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => "/ssi-include.shtml\n/ssi-include.shtml\n/ssi-include.shtml\nssi-include\n\nssi-include\n\n" } ];
ok($tf->handle_http($t) == 0, 'ssi - include');
ok($tf->stop_proc == 0, "Stopping lighttpd");

Loading…
Cancel
Save