From 0d9c3adf48626d03ea34f03e7bc5f3f9513e64fe Mon Sep 17 00:00:00 2001 From: Noah Sanci Date: Wed, 21 Jul 2021 14:52:07 -0400 Subject: [PATCH] debuginfod: Minor run-debuginfod-find.sh test fixes $PORT3 was left open on error and $PID4 was not properly killed. This patch addresses both of those issues by closing $PORT3 as $PORT1 and $PORT2 were in err() and waiting for $PID4 to terminate before continuing with the test. Signed-off-by: Noah Sanci --- tests/ChangeLog | 5 +++++ tests/run-debuginfod-find.sh | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index 1196d6b2..597e9dbe 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2021-07-21 Noah Sanci + + * run-debuginfod-find.sh: Properly kill $PID4 by waiting for it to + finish. Close $PORT3 in err(). + 2021-06-28 Noah Sanci PR25978 diff --git a/tests/run-debuginfod-find.sh b/tests/run-debuginfod-find.sh index 1d664be9..b65f3580 100755 --- a/tests/run-debuginfod-find.sh +++ b/tests/run-debuginfod-find.sh @@ -54,7 +54,7 @@ trap cleanup 0 1 2 3 5 9 15 errfiles_list= err() { echo ERROR REPORTS - for ports in $PORT1 $PORT2 + for ports in $PORT1 $PORT2 $PORT3 do echo ERROR REPORT $port metrics curl -s http://127.0.0.1:$port/metrics @@ -754,6 +754,8 @@ wait_ready $PORT3 'groom{statistic="files scanned (#)"}' 0 wait_ready $PORT3 'groom{statistic="files scanned (mb)"}' 0 kill $PID4 +wait $PID4 +PID4=0 ######################################################################## # set up tests for retrying failed queries. -- 2.31.1