Updated ChangeLog
On Wed, Jul 21, 2021 at 3:06 PM Noah Sanci <nsa...@redhat.com> wrote:
>
> Hello,
>
> Here are some small fixes for run-debuginfod-find.sh.
>
> Noah
From 494db032911889c404c59391031554377fa9ee55 Mon Sep 17 00:00:00 2001
From: Noah Sanci <nsa...@redhat.com>
Date: Wed, 21 Jul 2021 14:52:07 -0400
Subject: [PATCH] debuginfod: Minor run-debuginfod-find.sh test fixes
$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 <nsa...@redhat.com>
---
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..51ae44eb 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2021-07-21 Noah Sanci <nsa...@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 <nsa...@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.
--
2.31.1
