From c6c9b5b4363d57b00566d93243edb677c03312d7 Mon Sep 17 00:00:00 2001 From: Lukasz Mierzwa Date: Thu, 3 Mar 2022 13:12:24 +0000 Subject: [PATCH] Try speeding up testscript tests --- cmd/pint/tests/0041_watch.txt | 7 ++++--- cmd/pint/tests/0042_watch_metrics.txt | 2 +- cmd/pint/tests/0043_watch_cancel.txt | 4 ++-- cmd/pint/tests/0054_watch_metrics_prometheus.txt | 2 +- cmd/pint/tests/0057_watch_metrics_prometheus_ignore.txt | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cmd/pint/tests/0041_watch.txt b/cmd/pint/tests/0041_watch.txt index 40d1e116..8fcfea94 100644 --- a/cmd/pint/tests/0041_watch.txt +++ b/cmd/pint/tests/0041_watch.txt @@ -1,11 +1,11 @@ exec bash -x ./test.sh & -pint.ok --no-color -l debug watch --interval=10s --listen=:6041 --pidfile=pint.pid rules +pint.ok --no-color -l debug watch --interval=5s --listen=:6041 --pidfile=pint.pid rules ! stdout . stderr 'level=info msg="Pidfile created" path=pint.pid' stderr 'level=info msg="Started HTTP server" address=:6041' -stderr 'level=info msg="Will continuously run checks until terminated" interval=10s' +stderr 'level=info msg="Will continuously run checks until terminated" interval=5s' stderr 'level=debug msg="Clearing cache"' stderr 'level=debug msg="Running checks"' stderr 'level=error msg="Got an error when running checks" error="no matching files"' @@ -20,6 +20,7 @@ stderr 'level=info msg="Pidfile removed" path=pint.pid' grep '^pint_check_iterations_total 2$' curl.txt -- test.sh -- -sleep 15 +sleep 7 curl -so curl.txt http://127.0.0.1:6041/metrics +grep -E '^pint_check_iterations_total ' curl.txt cat pint.pid | xargs kill diff --git a/cmd/pint/tests/0042_watch_metrics.txt b/cmd/pint/tests/0042_watch_metrics.txt index 08e8cf4b..4eeb471d 100644 --- a/cmd/pint/tests/0042_watch_metrics.txt +++ b/cmd/pint/tests/0042_watch_metrics.txt @@ -4,7 +4,7 @@ pint.ok watch --listen=:6042 --pidfile=pint.pid rules cmp curl.txt metrics.txt -- test.sh -- -sleep 5 +sleep 3 curl -s http://127.0.0.1:6042/metrics | grep -vE 'process_|go_info' | perl -pe "s/^([a-zA-Z].+)[ ]([0-9\.\-\+eE]+)$/\1/g" > curl.txt cat pint.pid | xargs kill diff --git a/cmd/pint/tests/0043_watch_cancel.txt b/cmd/pint/tests/0043_watch_cancel.txt index 541599c2..c6d03ee2 100644 --- a/cmd/pint/tests/0043_watch_cancel.txt +++ b/cmd/pint/tests/0043_watch_cancel.txt @@ -12,7 +12,7 @@ stderr 'level=info msg="Waiting for all background tasks to finish"' stderr 'level=info msg="Background worker finished"' -- test.sh -- -sleep 5 +sleep 3 cat pint.pid | xargs kill cat prometheus.pid | xargs kill @@ -76,7 +76,7 @@ func main() { stop <- syscall.SIGTERM }() <-stop - ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), time.Second) defer cancel() server.Shutdown(ctx) } diff --git a/cmd/pint/tests/0054_watch_metrics_prometheus.txt b/cmd/pint/tests/0054_watch_metrics_prometheus.txt index 7b4cbba2..c20773cc 100644 --- a/cmd/pint/tests/0054_watch_metrics_prometheus.txt +++ b/cmd/pint/tests/0054_watch_metrics_prometheus.txt @@ -7,7 +7,7 @@ pint.ok watch --listen=:6054 --pidfile=pint.pid rules cmp curl.txt metrics.txt -- test.sh -- -sleep 15 +sleep 3 curl -s http://127.0.0.1:6054/metrics | grep 'pint_' | perl -pe "s/^([a-zA-Z].+)[ ]([0-9\.\-\+eE]+)$/\1/g" > curl.txt cat pint.pid | xargs kill cat prometheus.pid | xargs kill diff --git a/cmd/pint/tests/0057_watch_metrics_prometheus_ignore.txt b/cmd/pint/tests/0057_watch_metrics_prometheus_ignore.txt index 5db0b2c3..3c50e708 100644 --- a/cmd/pint/tests/0057_watch_metrics_prometheus_ignore.txt +++ b/cmd/pint/tests/0057_watch_metrics_prometheus_ignore.txt @@ -7,7 +7,7 @@ pint.ok watch --listen=:6057 --pidfile=pint.pid rules cmp curl.txt metrics.txt -- test.sh -- -sleep 15 +sleep 3 curl -s http://127.0.0.1:6057/metrics | grep 'pint_' | perl -pe "s/^([a-zA-Z].+)[ ]([0-9\.\-\+eE]+)$/\1/g" > curl.txt cat pint.pid | xargs kill cat prometheus.pid | xargs kill