diff options
| author | Noah Sanci <nsanci@redhat.com> | 2021-07-21 14:52:07 -0400 |
|---|---|---|
| committer | Noah Sanci <nsanci@redhat.com> | 2021-07-21 15:24:16 -0400 |
| commit | 494db032911889c404c59391031554377fa9ee55 (patch) | |
| tree | 0ecdb4c412f6964ee0c67ba89e886cbfd2412368 | |
| parent | 0aed4315b2f6c54f4efcf8a8d22e59a36e6eb30d (diff) | |
| download | elfutils-nsanci-elfutils-test-fix.tar.gz | |
debuginfod: Minor run-debuginfod-find.sh test fixesnsanci-elfutils-test-fix
$PORT3's metrics are not reported on error and $PID4 was not properly
killed. This patch addresses both of those issues by reporting the
metrics of $PORT3 as $PORT1 and $PORT2 were in err() and waiting for
$PID4 to terminate before continuing with the test.
Signed-off-by: Noah Sanci <nsanci@redhat.com>
| -rw-r--r-- | tests/ChangeLog | 5 | ||||
| -rwxr-xr-x | tests/run-debuginfod-find.sh | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 1196d6b2..51ae44eb 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2021-07-21 Noah Sanci <nsanci@redhat.com> + + * run-debuginfod-find.sh: Properly kill $PID4 by waiting for it to + finish. Report $PORT3's metrics in err(). + 2021-06-28 Noah Sanci <nsanci@redhat.com> 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. |