test suite: gpg-agent workaround: Cope if ps not found.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index a0fea922eff2404f9d2b921f17b2701b2111fbbb..8076ac0d8303255352144a8ee126b87b43d12f84 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dgit (5.5+exp6) experimental; urgency=medium
+
+  * test suite: gpg-agent workaround: Cope if ps not found.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 29 Jun 2018 13:02:30 +0100
+
 dgit (5.5+exp5) experimental; urgency=medium
 
   * test suite: gpg-agent workaround: Add more debugging output.

diff --git a/tests/tstunt/gpg-withagent b/tests/tstunt/gpg-withagent
index 4318cce041d995003c2b857ab75f78a1995bbe30..3f56d085c21125df5bbe2ab7fdfcb3c5485729cb 100755 (executable)
--- a/tests/tstunt/gpg-withagent
+++ b/tests/tstunt/gpg-withagent
@@ -3,7 +3,7 @@ set -ex
 
 d () {
        date --iso-8601=ns >&2
-       ps -ef | grep gpg-agent >&2
+       ps -ef | grep gpg-agent ||: >&2
 }
 
 d