[Python-modules-commits] [python-tornado] 02/03: merge patched into master

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository python-tornado.

commit 37039318d1a356a22dafa4406a1a1ce1bf86a81a
Merge: 8bbc03c 44ee8c8
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sat May 21 21:56:08 2016 +0000

    merge patched into master

 debian/.git-dpm                        |  4 ++--
 debian/patches/fix-ftbfs-on-hurd.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 tornado/test/httpserver_test.py        |  2 ++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 7ff0eb7,0000000..bb34b9c
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
- 73f44194f23e0f247d8646351dbd5ac61c2b7c8e
- 73f44194f23e0f247d8646351dbd5ac61c2b7c8e
++44ee8c84f5de63d02dfee6784814ca823672687a
++44ee8c84f5de63d02dfee6784814ca823672687a
 +b10d25d01667a1069e6607ceb8ec948e27e3063c
 +b10d25d01667a1069e6607ceb8ec948e27e3063c
 +python-tornado_4.3.0.orig.tar.gz
 +b488ab5baa09167699d2baa8e443d0aa07a57c99
 +475749
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/fix-ftbfs-on-hurd.patch
index 0000000,0000000..e977aec
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-ftbfs-on-hurd.patch
@@@ -1,0 -1,0 +1,28 @@@
++From 44ee8c84f5de63d02dfee6784814ca823672687a Mon Sep 17 00:00:00 2001
++From: Mattia Rizzolo <mattia at debian.org>
++Date: Sat, 21 May 2016 21:55:27 +0000
++Subject: skip UnixSocketTest on hurd, as unix sockets with SO_REUSEADDR are
++ not supported there
++
++ A little discussion about unix sockets with SO_REUSEADDR can be found on
++ https://lists.gnu.org/archive/html/bug-hurd/2016-01/msg00039.html
++
++Forwarded: no
++Patch-Name: fix-ftbfs-on-hurd.patch
++---
++ tornado/test/httpserver_test.py | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
++index 065f5b1..a031ce6 100644
++--- a/tornado/test/httpserver_test.py
+++++ b/tornado/test/httpserver_test.py
++@@ -544,6 +544,8 @@ class ManualProtocolTest(HandlerBaseTestCase):
++ 
++ @unittest.skipIf(not hasattr(socket, 'AF_UNIX') or sys.platform == 'cygwin',
++                  "unix sockets not supported on this platform")
+++ at unittest.skipIf(sys.platform == 'gnu0',
+++                 "unix sockets with SO_REUSEADDR not supported on this platform")
++ class UnixSocketTest(AsyncTestCase):
++     """HTTPServers can listen on Unix sockets too.
++ 
diff --cc debian/patches/series
index da9d125,0000000..4fb1888
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,6 @@@
 +domain-test.patch
 +ignoreuserwarning.patch
 +skip-timing-tests.patch
 +sockopt.patch
 +without-certifi.patch
++fix-ftbfs-on-hurd.patch

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