[Python-modules-commits] [python-asyncssh] 03/08: d/patches: fix tests using SSH agent. Closes: #881096

[Vincent Bernat]

This is an automated email from the git hooks/post-receive script.

bernat pushed a commit to annotated tag debian/1.11.1-1
in repository python-asyncssh.

commit 89d804431aa1718440c782b7e665df49a00ed904
Author: Vincent Bernat <vincent at bernat.im>
Date:   Sat Nov 11 21:48:16 2017 +0100

    d/patches: fix tests using SSH agent. Closes: #881096
---
 debian/changelog                                    |  2 +-
 ...spawning-an-SSH-agent-when-previous-socket.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2079fc5..9e38616 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 python-asyncssh (1.11.0-2) UNRELEASED; urgency=medium
 
   * d/patches: remove tests using deprecated ciphers. Closes: #881096.
-  * TODO: second error in #881096 (killing SSH agent).
+  * d/patches: fix tests using SSH agent. Closes: #881096.
 
  -- Vincent Bernat <bernat at debian.org>  Sat, 11 Nov 2017 21:23:44 +0100
 
diff --git a/debian/patches/0004-fix-tests-spawning-an-SSH-agent-when-previous-socket.patch b/debian/patches/0004-fix-tests-spawning-an-SSH-agent-when-previous-socket.patch
new file mode 100644
index 0000000..1655e6e
--- /dev/null
+++ b/debian/patches/0004-fix-tests-spawning-an-SSH-agent-when-previous-socket.patch
@@ -0,0 +1,21 @@
+From: Vincent Bernat <vincent at bernat.im>
+Date: Sat, 11 Nov 2017 21:47:06 +0100
+Subject: fix tests spawning an SSH agent when previous socket still here
+
+---
+ tests/test_agent.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_agent.py b/tests/test_agent.py
+index 966d839..5ee1226 100644
+--- a/tests/test_agent.py
++++ b/tests/test_agent.py
+@@ -109,7 +109,7 @@ class _TestAPI(AsyncTestCase):
+         os.environ['SSH_ASKPASS'] = os.path.join(os.getcwd(), 'ssh-askpass')
+ 
+         try:
+-            output = run('ssh-agent -a agent 2>/dev/null')
++            output = run('rm -f agent; ssh-agent -a agent 2>/tmp/test66')
+         except subprocess.CalledProcessError: # pragma: no cover
+             raise unittest.SkipTest('ssh-agent not available')
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e8f4f41..d126cd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 sphinx-use-default-theme.patch
 0002-skip-tests-requiring-network-access.patch
 0003-remove-tests-using-deprecated-ciphers.patch
+0004-fix-tests-spawning-an-SSH-agent-when-previous-socket.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-asyncssh.git