From c3d91cda6e99b0529e2d3c16c5aa1571749c3a1a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 27 Oct 2017 00:18:32 +0100 Subject: [PATCH] test.sh: Kill stray ostree-trivial-httpd processes --- debian/changelog | 1 + debian/test.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d0100531..89293715 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ ostree (2017.12-2) UNRELEASED; urgency=medium * d/p/2017.13/tests-Add-test-pull-bareuseronly.patch: Add more test coverage from upstream - d/rules: Make the new test executable + * d/test.sh: Clean up ostree-trivial-httpd processes -- Simon McVittie Mon, 16 Oct 2017 10:13:54 +0100 diff --git a/debian/test.sh b/debian/test.sh index eadeda4e..b46c538c 100755 --- a/debian/test.sh +++ b/debian/test.sh @@ -28,10 +28,12 @@ if [ "$failed" -gt 0 ]; then fi pkill --full "gpg-agent --homedir /var/tmp/tap-test\\.[^/]+/.*" || : +pkill --full '\.libs/ostree-trivial-httpd' || : -if pgrep lt-ostree || pgrep --full "gpg-agent --homedir /var/tmp/tap-test."; then \ +if pgrep lt-ostree || pgrep --full '\.libs/ostree-trivial-httpd' || pgrep --full "gpg-agent --homedir /var/tmp/tap-test."; then \ echo "WARNING: daemon processes were leaked" pgrep gpg-agent | xargs --no-run-if-empty ps ww + pgrep --full '\.libs/ostree-trivial-httpd' | xargs --no-run-if-empty ps ww pgrep lt-ostree | xargs --no-run-if-empty ps ww fi