public inbox for elfutils@sourceware.org
 help / color / mirror / Atom feed
From: Noah Sanci <nsanci@redhat.com>
To: elfutils-devel@sourceware.org
Subject: [debuginfod] Minor run-debuginfod-find.sh test fixes
Date: Wed, 21 Jul 2021 15:06:54 -0400	[thread overview]
Message-ID: <CAJXA7qiUNoe76n+myYuZjwxsOmn0-4A8vSF6PTH4OXu6hM+7Qw@mail.gmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 68 bytes --]

Hello,

Here are some small fixes for run-debuginfod-find.sh.

Noah

[-- Attachment #2: 0001-debuginfod-Minor-run-debuginfod-find.sh-test-fixes.patch --]
[-- Type: text/x-patch, Size: 1714 bytes --]

From 0d9c3adf48626d03ea34f03e7bc5f3f9513e64fe Mon Sep 17 00:00:00 2001
From: Noah Sanci <nsanci@redhat.com>
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 <nsanci@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..597e9dbe 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. Close $PORT3 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.
-- 
2.31.1


             reply	other threads:[~2021-07-21 19:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-21 19:06 Noah Sanci [this message]
2021-07-21 19:26 ` Noah Sanci
2021-07-22 12:02   ` Mark Wielaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAJXA7qiUNoe76n+myYuZjwxsOmn0-4A8vSF6PTH4OXu6hM+7Qw@mail.gmail.com \
    --to=nsanci@redhat.com \
    --cc=elfutils-devel@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).