[Python-modules-commits] [python-websockets] 11/12: merge patched into master

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository python-websockets.

commit b77292d6080b91408c4942503c0b7f317e18514a
Merge: 706d44b 3dc5564
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sat Nov 5 22:55:25 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../patches/0001-Fix-tests-on-Python-3.5.2.patch   | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 websockets/test_protocol.py                        | 10 ++++--
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index a300aef,0000000..c58638a
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
- 90b0aa6f6d822ea6f927f1134014594790ebf802
- 90b0aa6f6d822ea6f927f1134014594790ebf802
++3dc55641e1914ce8c5b39bfbb2bfd4d38c51fa9a
++3dc55641e1914ce8c5b39bfbb2bfd4d38c51fa9a
 +90b0aa6f6d822ea6f927f1134014594790ebf802
 +90b0aa6f6d822ea6f927f1134014594790ebf802
 +python-websockets_3.2.orig.tar.gz
 +a280efe51cbff4bc142e8c6c62b8316e66e89a0e
 +33279
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-tests-on-Python-3.5.2.patch
index 0000000,0000000..9ef84b2
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-tests-on-Python-3.5.2.patch
@@@ -1,0 -1,0 +1,41 @@@
++From 3dc55641e1914ce8c5b39bfbb2bfd4d38c51fa9a Mon Sep 17 00:00:00 2001
++From: Julien Enselme <julien.enselme at centrale-marseille.fr>
++Date: Sun, 18 Sep 2016 17:48:45 +0200
++Subject: Fix tests on Python 3.5.2
++
++get_extra_info is called with 'sslcontext' before being called as
++expected. Adapt the tests accordingly.
++
++Close #123
++---
++ websockets/test_protocol.py | 10 ++++++++--
++ 1 file changed, 8 insertions(+), 2 deletions(-)
++
++diff --git a/websockets/test_protocol.py b/websockets/test_protocol.py
++index 2e256c6..312f7e7 100644
++--- a/websockets/test_protocol.py
+++++ b/websockets/test_protocol.py
++@@ -258,7 +258,10 @@ class CommonTests:
++         self.run_loop_once()
++         # The connection is established.
++         self.assertEqual(self.protocol.local_address, ('host', 4312))
++-        get_extra_info.assert_called_once_with('sockname', None)
+++        if get_extra_info.call_count == 2:
+++            assert get_extra_info.call_args_list == [(('sslcontext',),), (('sockname', None),)]
+++        else:
+++            get_extra_info.assert_called_once_with('sockname', None)
++ 
++     def test_remote_address(self):
++         get_extra_info = unittest.mock.Mock(return_value=('host', 4312))
++@@ -268,7 +271,10 @@ class CommonTests:
++         self.run_loop_once()
++         # The connection is established.
++         self.assertEqual(self.protocol.remote_address, ('host', 4312))
++-        get_extra_info.assert_called_once_with('peername', None)
+++        if get_extra_info.call_count == 2:
+++            assert get_extra_info.call_args_list == [(('sslcontext',),), (('peername', None),)]
+++        else:
+++            get_extra_info.assert_called_once_with('peername', None)
++ 
++     def test_open(self):
++         self.assertTrue(self.protocol.open)
diff --cc debian/patches/series
index 0000000,0000000..0fa61cd
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-tests-on-Python-3.5.2.patch

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