Loading pkgs/servers/http/lighttpd/default.nix +5 −0 Original line number Diff line number Diff line Loading @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-FqyNuV5xlim6YZSbmfiib+upRqgdGFIVsoN5u0EWsLQ="; }; patches = [ # disable tests for des/md5, which we don't support any more ./disable-legacy-crypt-tests.patch ]; postPatch = '' patchShebangs tests # Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests Loading pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch 0 → 100644 +37 −0 Original line number Diff line number Diff line diff --git a/tests/mod-fastcgi.t b/tests/mod-fastcgi.t index 25016e60..e0427046 100755 --- a/tests/mod-fastcgi.t +++ b/tests/mod-fastcgi.t @@ -79,7 +79,7 @@ EOF ok($tf->handle_http($t) == 0, 'FastCGI + bin-copy-environment'); SKIP: { - skip "no crypt-des under openbsd", 2 if $^O eq 'openbsd'; + skip "no crypt-des", 2; $t->{REQUEST} = ( <<EOF GET /get-server-env.php?env=REMOTE_USER HTTP/1.0 diff --git a/tests/request.t b/tests/request.t index f56a4300..36e67b88 100755 --- a/tests/request.t +++ b/tests/request.t @@ -1105,7 +1105,7 @@ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ]; ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - plain'); SKIP: { - skip "no crypt-des under openbsd", 2 if $^O eq 'openbsd'; + skip "no crypt-des", 2; $t->{REQUEST} = ( <<EOF GET /server-config HTTP/1.0 Host: auth-htpasswd.example.org @@ -1162,9 +1162,7 @@ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ]; ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (apr-md5, wrong password)'); SKIP: { - skip "no crypt-md5 under cygwin", 1 if $^O eq 'cygwin'; - skip "no crypt-md5 under darwin", 1 if $^O eq 'darwin'; - skip "no crypt-md5 under openbsd",1 if $^O eq 'openbsd'; + skip "no crypt-md5", 1; $t->{REQUEST} = ( <<EOF GET /server-config HTTP/1.0 Host: auth-htpasswd.example.org Loading
pkgs/servers/http/lighttpd/default.nix +5 −0 Original line number Diff line number Diff line Loading @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-FqyNuV5xlim6YZSbmfiib+upRqgdGFIVsoN5u0EWsLQ="; }; patches = [ # disable tests for des/md5, which we don't support any more ./disable-legacy-crypt-tests.patch ]; postPatch = '' patchShebangs tests # Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests Loading
pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch 0 → 100644 +37 −0 Original line number Diff line number Diff line diff --git a/tests/mod-fastcgi.t b/tests/mod-fastcgi.t index 25016e60..e0427046 100755 --- a/tests/mod-fastcgi.t +++ b/tests/mod-fastcgi.t @@ -79,7 +79,7 @@ EOF ok($tf->handle_http($t) == 0, 'FastCGI + bin-copy-environment'); SKIP: { - skip "no crypt-des under openbsd", 2 if $^O eq 'openbsd'; + skip "no crypt-des", 2; $t->{REQUEST} = ( <<EOF GET /get-server-env.php?env=REMOTE_USER HTTP/1.0 diff --git a/tests/request.t b/tests/request.t index f56a4300..36e67b88 100755 --- a/tests/request.t +++ b/tests/request.t @@ -1105,7 +1105,7 @@ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ]; ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - plain'); SKIP: { - skip "no crypt-des under openbsd", 2 if $^O eq 'openbsd'; + skip "no crypt-des", 2; $t->{REQUEST} = ( <<EOF GET /server-config HTTP/1.0 Host: auth-htpasswd.example.org @@ -1162,9 +1162,7 @@ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ]; ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (apr-md5, wrong password)'); SKIP: { - skip "no crypt-md5 under cygwin", 1 if $^O eq 'cygwin'; - skip "no crypt-md5 under darwin", 1 if $^O eq 'darwin'; - skip "no crypt-md5 under openbsd",1 if $^O eq 'openbsd'; + skip "no crypt-md5", 1; $t->{REQUEST} = ( <<EOF GET /server-config HTTP/1.0 Host: auth-htpasswd.example.org