Merge pull request #65190 from samueldr/fix/tomcat-connector
nixos/tests: drop tomcat connector test
This commit is contained in:
commit
3172e33b71
@ -248,7 +248,6 @@ in
|
|||||||
taskserver = handleTest ./taskserver.nix {};
|
taskserver = handleTest ./taskserver.nix {};
|
||||||
telegraf = handleTest ./telegraf.nix {};
|
telegraf = handleTest ./telegraf.nix {};
|
||||||
tinydns = handleTest ./tinydns.nix {};
|
tinydns = handleTest ./tinydns.nix {};
|
||||||
tomcat = handleTest ./tomcat.nix {};
|
|
||||||
tor = handleTest ./tor.nix {};
|
tor = handleTest ./tor.nix {};
|
||||||
transmission = handleTest ./transmission.nix {};
|
transmission = handleTest ./transmission.nix {};
|
||||||
udisks2 = handleTest ./udisks2.nix {};
|
udisks2 = handleTest ./udisks2.nix {};
|
||||||
|
@ -1,30 +0,0 @@
|
|||||||
import ./make-test.nix ({ pkgs, ...} : {
|
|
||||||
name = "tomcat";
|
|
||||||
meta = with pkgs.stdenv.lib.maintainers; {
|
|
||||||
maintainers = [ eelco ];
|
|
||||||
};
|
|
||||||
|
|
||||||
nodes = {
|
|
||||||
server =
|
|
||||||
{ ... }:
|
|
||||||
|
|
||||||
{ services.tomcat.enable = true;
|
|
||||||
services.httpd.enable = true;
|
|
||||||
services.httpd.adminAddr = "foo@bar.com";
|
|
||||||
services.httpd.extraSubservices =
|
|
||||||
[ { serviceType = "tomcat-connector"; } ];
|
|
||||||
networking.firewall.allowedTCPPorts = [ 80 ];
|
|
||||||
};
|
|
||||||
|
|
||||||
client = { };
|
|
||||||
};
|
|
||||||
|
|
||||||
testScript = ''
|
|
||||||
startAll;
|
|
||||||
|
|
||||||
$server->waitForUnit("tomcat");
|
|
||||||
$client->waitForUnit("network.target");
|
|
||||||
$client->waitUntilSucceeds("curl --fail http://server/examples/servlets/servlet/HelloWorldExample");
|
|
||||||
$client->waitUntilSucceeds("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp");
|
|
||||||
'';
|
|
||||||
})
|
|
Loading…
Reference in New Issue
Block a user