[Python-modules-commits] r32742 - in packages/python-tornado/trunk/debian/patches (4 files)
jpuydt-guest at users.alioth.debian.org
jpuydt-guest at users.alioth.debian.org
Wed May 20 14:46:40 UTC 2015
Date: Wednesday, May 20, 2015 @ 14:46:39
Author: jpuydt-guest
Revision: 32742
Refresh previous patches
Modified:
packages/python-tornado/trunk/debian/patches/domain-test.patch
packages/python-tornado/trunk/debian/patches/ignoreuserwarning.patch
packages/python-tornado/trunk/debian/patches/skip-timing-tests.patch
packages/python-tornado/trunk/debian/patches/sockopt.patch
Modified: packages/python-tornado/trunk/debian/patches/domain-test.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/domain-test.patch 2015-05-20 14:46:37 UTC (rev 32741)
+++ packages/python-tornado/trunk/debian/patches/domain-test.patch 2015-05-20 14:46:39 UTC (rev 32742)
@@ -1,8 +1,10 @@
Description: use a domain that is more likely invalid
avoids test failures in unisolated builds
+diff --git a/tornado/test/netutil_test.py b/tornado/test/netutil_test.py
+index 1df1e32..ee664dc 100644
--- a/tornado/test/netutil_test.py
+++ b/tornado/test/netutil_test.py
-@@ -60,7 +60,7 @@ class _ResolverTestMixin(object):
+@@ -56,7 +56,7 @@ class _ResolverErrorTestMixin(object):
return True # Halt propagation.
with ExceptionStackContext(handler):
@@ -11,12 +13,12 @@
result = self.wait()
self.assertIsInstance(result, Exception)
-@@ -69,7 +69,7 @@ class _ResolverTestMixin(object):
+@@ -64,7 +64,7 @@ class _ResolverErrorTestMixin(object):
+ @gen_test
def test_future_interface_bad_host(self):
- self.skipOnCares()
with self.assertRaises(Exception):
- yield self.resolver.resolve('an invalid domain', 80,
+ yield self.resolver.resolve('ana8sdasdadasdasdas1d12invalidsdasdbwefrwfejnefsegfsdomain', 80,
socket.AF_UNSPEC)
-
+ def _failing_getaddrinfo(*args):
Modified: packages/python-tornado/trunk/debian/patches/ignoreuserwarning.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/ignoreuserwarning.patch 2015-05-20 14:46:37 UTC (rev 32741)
+++ packages/python-tornado/trunk/debian/patches/ignoreuserwarning.patch 2015-05-20 14:46:39 UTC (rev 32742)
@@ -1,9 +1,11 @@
Description: ignore userwarning in tests
Required to run tests from source with the package already installed.
Else one gets check_version_conflict warning from pkg_resources.
+diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py
+index acbb569..ee3c603 100644
--- a/tornado/test/runtests.py
+++ b/tornado/test/runtests.py
-@@ -72,6 +72,7 @@ if __name__ == '__main__':
+@@ -95,6 +95,7 @@ def main():
# setuptools sometimes gives ImportWarnings about things that are on
# sys.path even if they're not being used.
warnings.filterwarnings("ignore", category=ImportWarning)
Modified: packages/python-tornado/trunk/debian/patches/skip-timing-tests.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/skip-timing-tests.patch 2015-05-20 14:46:37 UTC (rev 32741)
+++ packages/python-tornado/trunk/debian/patches/skip-timing-tests.patch 2015-05-20 14:46:39 UTC (rev 32742)
@@ -1,10 +1,14 @@
Description: like travis buildd are often slow so skip the same tests
+diff --git a/tornado/test/util.py b/tornado/test/util.py
+index 358809f..786e72e 100644
--- a/tornado/test/util.py
+++ b/tornado/test/util.py
-@@ -15,5 +15,5 @@ skipIfNonUnix = unittest.skipIf(os.name
+@@ -21,7 +21,7 @@ skipIfNonUnix = unittest.skipIf(os.name != 'posix' or sys.platform == 'cygwin',
# travis-ci.org runs our tests in an overworked virtual machine, which makes
# timing-related tests unreliable.
-skipOnTravis = unittest.skipIf('TRAVIS' in os.environ,
+skipOnTravis = unittest.skipIf(True,
'timing tests unreliable on travis')
+
+ # Set the environment variable NO_NETWORK=1 to disable any tests that
Modified: packages/python-tornado/trunk/debian/patches/sockopt.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/sockopt.patch 2015-05-20 14:46:37 UTC (rev 32741)
+++ packages/python-tornado/trunk/debian/patches/sockopt.patch 2015-05-20 14:46:39 UTC (rev 32742)
@@ -1,29 +1,11 @@
-Ignore ENOPROTOOPT errors from SO_REUSEADDR or SO_ERROR on AF_UNIX sockets, for
+Description: Ignore ENOPROTOOPT errors from SO_REUSEADDR or SO_ERROR on AF_UNIX sockets, for
systems which do not implement them there.
-
-Index: python-tornado-3.2.0/tornado/netutil.py
-===================================================================
---- python-tornado-3.2.0.orig/tornado/netutil.py
-+++ python-tornado-3.2.0/tornado/netutil.py
-@@ -119,7 +119,11 @@ if hasattr(socket, 'AF_UNIX'):
- """
- sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
- set_close_exec(sock.fileno())
-- sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-+ try:
-+ sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-+ except socket.error as e:
-+ if e.args[0] != errno.ENOPROTOOPT:
-+ raise
- sock.setblocking(0)
- try:
- st = os.stat(file)
-Index: python-tornado-3.2.0/tornado/iostream.py
-===================================================================
---- python-tornado-3.2.0.orig/tornado/iostream.py
-+++ python-tornado-3.2.0/tornado/iostream.py
-@@ -748,7 +748,12 @@ class IOStream(BaseIOStream):
- self._add_io_state(self.io_loop.WRITE)
+diff --git a/tornado/iostream.py b/tornado/iostream.py
+index cdb6250..dd2624c 100644
+--- a/tornado/iostream.py
++++ b/tornado/iostream.py
+@@ -1114,7 +1114,12 @@ class IOStream(BaseIOStream):
+ return future
def _handle_connect(self):
- err = self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
@@ -36,3 +18,20 @@
if err != 0:
self.error = socket.error(err, os.strerror(err))
# IOLoop implementations may vary: some of them return
+diff --git a/tornado/netutil.py b/tornado/netutil.py
+index 17e9580..895fb1d 100644
+--- a/tornado/netutil.py
++++ b/tornado/netutil.py
+@@ -122,7 +122,11 @@ def bind_sockets(port, address=None, family=socket.AF_UNSPEC,
+ raise
+ set_close_exec(sock.fileno())
+ if os.name != 'nt':
+- sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
++ try:
++ sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
++ except socket.error as e:
++ if e.args[0] != errno.ENOPROTOOPT:
++ raise
+ if af == socket.AF_INET6:
+ # On linux, ipv6 sockets accept ipv4 too by default,
+ # but this makes it impossible to bind to both
More information about the Python-modules-commits
mailing list