From 274fb7e0b98e19d284e64510cc101ea54d69bc34 Mon Sep 17 00:00:00 2001 From: Jan Hrnko Date: Wed, 6 Nov 2019 07:17:39 +0100 Subject: nixos/trickster: port test to python --- nixos/tests/trickster.nix | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'nixos') diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix index 1461a32bb07..e2ca00980d5 100644 --- a/nixos/tests/trickster.nix +++ b/nixos/tests/trickster.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ... }: { +import ./make-test-python.nix ({ pkgs, ... }: { name = "trickster"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ "1000101" ]; @@ -15,15 +15,23 @@ import ./make-test.nix ({ pkgs, ... }: { }; testScript = '' - startAll; - $prometheus->waitForUnit("prometheus.service"); - $prometheus->waitForOpenPort(9090); - $prometheus->waitUntilSucceeds("curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'"); - $trickster->waitForUnit("trickster.service"); - $trickster->waitForOpenPort(8082); - $trickster->waitForOpenPort(9090); - $trickster->waitUntilSucceeds("curl -L http://localhost:8082/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'"); - $trickster->waitUntilSucceeds("curl -L http://prometheus:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'"); - $trickster->waitUntilSucceeds("curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'"); + start_all() + prometheus.wait_for_unit("prometheus.service") + prometheus.wait_for_open_port(9090) + prometheus.wait_until_succeeds( + "curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + ) + trickster.wait_for_unit("trickster.service") + trickster.wait_for_open_port(8082) + trickster.wait_for_open_port(9090) + trickster.wait_until_succeeds( + "curl -L http://localhost:8082/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + ) + trickster.wait_until_succeeds( + "curl -L http://prometheus:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + ) + trickster.wait_until_succeeds( + "curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + ) ''; }) \ No newline at end of file -- cgit 1.4.1