diff --git a/debian/changelog b/debian/changelog index 241abf5..88d6190 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ python-eventlet (0.19.0-2) UNRELEASED; urgency=medium * Add allow-more-busy-cpu.patch, as tests are failing in Jenkins. * Using pkgos-dh_auto_install from openstack-pkg-tools (>= 52~). * Correctly tests with nose & Py3. + * Remove tests expecting timeout on 192.0.2.1. -- Thomas Goirand Tue, 19 Jul 2016 15:50:13 +0200 diff --git a/debian/patches/remove-networking-tests.patch b/debian/patches/remove-networking-tests.patch new file mode 100644 index 0000000..31a2921 --- /dev/null +++ b/debian/patches/remove-networking-tests.patch @@ -0,0 +1,65 @@ +Description: Remove networking tests + Upstream is attempting connection to 192.0.2.1 on port 80, and expects + it to always timeout. However, some Debian users may well have a web + server running on that IP address, meaning the test would fail in such + setup (even if this is reserved IANA IPs). Therefore, removing such bad + tests. + . + Also, these tests have been failing for a reason on my arm64 builder, + probably because it's a slow machine. +Author: Thomas Goirand +Forwarded: no +Last-Update: 2016-07-19 + +--- python-eventlet-0.19.0.orig/tests/greenio_test.py ++++ python-eventlet-0.19.0/tests/greenio_test.py +@@ -74,18 +74,6 @@ class TestGreenSocket(tests.LimitedTestC + # 3.x io write to closed file-like pbject raises ValueError + self.assertRaises(ValueError, fd.write, b'a') + +- def test_connect_timeout(self): +- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +- s.settimeout(0.1) +- gs = greenio.GreenSocket(s) +- +- try: +- expect_socket_timeout(gs.connect, ('192.0.2.1', 80)) +- except socket.error as e: +- # unreachable is also a valid outcome +- if not get_errno(e) in (errno.EHOSTUNREACH, errno.ENETUNREACH): +- raise +- + def test_accept_timeout(self): + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.bind(('', 0)) +@@ -95,14 +83,6 @@ class TestGreenSocket(tests.LimitedTestC + gs = greenio.GreenSocket(s) + expect_socket_timeout(gs.accept) + +- def test_connect_ex_timeout(self): +- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +- s.settimeout(0.1) +- gs = greenio.GreenSocket(s) +- e = gs.connect_ex(('192.0.2.1', 80)) +- if e not in (errno.EHOSTUNREACH, errno.ENETUNREACH): +- self.assertEqual(e, errno.EAGAIN) +- + def test_recv_timeout(self): + listener = greenio.GreenSocket(socket.socket()) + listener.bind(('', 0)) +--- python-eventlet-0.19.0.orig/tests/socket_test.py ++++ python-eventlet-0.19.0/tests/socket_test.py +@@ -2,13 +2,6 @@ import eventlet + from eventlet.green import socket + + +-def test_create_connection_error(): +- try: +- socket.create_connection(('192.0.2.1', 80), timeout=0.1) +- except (IOError, OSError): +- pass +- +- + def test_recv_type(): + # https://github.com/eventlet/eventlet/issues/245 + # socket recv returning multiple data types diff --git a/debian/patches/series b/debian/patches/series index ab2b8d5..518a974 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ enforce-tlsv1-always.patch set-defaults-to-be-tlsv1-not-sslv23.patch fixed-privacy-breach-in-examples.patch allow-more-busy-cpu.patch +remove-networking-tests.patch