[Python-modules-commits] [python-asyncssh] 07/08: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository python-asyncssh.

commit 70532079e56e1998de4b9ba094311825809ce902
Merge: 8641b07 c1dab05
Author: Vincent Bernat <bernat at debian.org>
Date:   Sun Jan 3 18:12:04 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0002-skip-tests-requiring-network-access.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/test_auth_keys.py                            |  3 +++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 8926393,0000000..819af83
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 3490e4f87b75393e96d6c081b7999f4870ae09b4
- 3490e4f87b75393e96d6c081b7999f4870ae09b4
++c1dab057ad5b7dbf9591d1e1c8fe4812da7ba0ed
++c1dab057ad5b7dbf9591d1e1c8fe4812da7ba0ed
 +9a16010d1a050309e546d35f0996837f75780394
 +9a16010d1a050309e546d35f0996837f75780394
 +asyncssh-1.3.2.orig.tar.gz
 +0ad9ce3289e1a75292f39e51a925045fef9b34cf
 +170304
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-skip-tests-requiring-network-access.patch
index 0000000,0000000..52bdd2e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-skip-tests-requiring-network-access.patch
@@@ -1,0 -1,0 +1,30 @@@
++From c1dab057ad5b7dbf9591d1e1c8fe4812da7ba0ed Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Sun, 3 Jan 2016 18:11:46 +0100
++Subject: skip tests requiring network access
++
++---
++ tests/test_auth_keys.py | 3 +++
++ 1 file changed, 3 insertions(+)
++
++diff --git a/tests/test_auth_keys.py b/tests/test_auth_keys.py
++index a97177d7f038..d428e339fcd1 100644
++--- a/tests/test_auth_keys.py
+++++ b/tests/test_auth_keys.py
++@@ -17,6 +17,8 @@
++ 
++ """
++ 
+++import unittest
+++
++ from asyncssh import import_public_key
++ from asyncssh.auth_keys import import_authorized_keys, read_authorized_keys
++ 
++@@ -65,6 +67,7 @@ class _TestAuthorizedKeys(TempDirTestCase):
++         else:
++             return import_authorized_keys(auth_keys)
++ 
+++    @unittest.skip("network access is required for those tests")
++     def test_matches(self):
++         """Test authorized keys matching"""
++ 
diff --cc debian/patches/series
index 5baf5a8,0000000..d889a5c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +sphinx-use-default-theme.patch
++0002-skip-tests-requiring-network-access.patch

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