packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test.sh: Kill stray ostree-trivial-httpd processes

This commit is contained in:
Simon McVittie 2017-10-27 00:18:32 +01:00
parent 022fab56dc
commit c3d91cda6e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -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 <smcv@debian.org> Mon, 16 Oct 2017 10:13:54 +0100

4
debian/test.sh vendored
View File

@ -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