From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 29 Jun 2018 12:02:36 +0000 (+0100)
Subject: test suite: gpg-agent workaround: Cope if ps not found.
X-Git-Tag: archive/debian/5.5+exp6^0
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3ae4d20d8146c3ea111b3f622bf00adbd4e6442f

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 a0fea922..8076ac0d 100644
--- 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 4318cce0..3f56d085 100755
--- 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