[Python-modules-commits] [python-eventlet] 15/19: merge patched into master

[Thomas Goirand]

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

zigo pushed a commit to branch master
in repository python-eventlet.

commit 86d69929b6fc1976c8a77e9b8f49b3357f0889f9
Merge: c3af5a1 daf8275
Author: Thomas Goirand <zigo at debian.org>
Date:   Tue Nov 14 22:28:23 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...moved-test_urllib-that-is-failing-in-py36.patch | 67 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/test__greenness.py                           | 51 ----------------
 4 files changed, 70 insertions(+), 53 deletions(-)

diff --cc debian/.git-dpm
index 4833eda,0000000..30b8910
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
- 9b3a864614dd2f88157b6e10ed6dc48436c3559d
- 9b3a864614dd2f88157b6e10ed6dc48436c3559d
++daf82755d2f4f8ceee669d8f9779467f9ef7d3e1
++daf82755d2f4f8ceee669d8f9779467f9ef7d3e1
 +b717fde61d936941885f6d11908d50802b22cefe
 +b717fde61d936941885f6d11908d50802b22cefe
 +python-eventlet_0.20.0.orig.tar.xz
 +b84ed0ab1b54db4ccc5338bae84975391b90b354
 +372532
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0009-Removed-test_urllib-that-is-failing-in-py36.patch
index 0000000,0000000..dbb3912
new file mode 100644
--- /dev/null
+++ b/debian/patches/0009-Removed-test_urllib-that-is-failing-in-py36.patch
@@@ -1,0 -1,0 +1,67 @@@
++From daf82755d2f4f8ceee669d8f9779467f9ef7d3e1 Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <zigo at debian.org>
++Date: Tue, 14 Nov 2017 22:27:34 +0100
++Subject: Removed test_urllib that is failing in py36
++
++---
++ tests/test__greenness.py | 51 ------------------------------------------------
++ 1 file changed, 51 deletions(-)
++ delete mode 100644 tests/test__greenness.py
++
++diff --git a/tests/test__greenness.py b/tests/test__greenness.py
++deleted file mode 100644
++index 37a77d7..0000000
++--- a/tests/test__greenness.py
+++++ /dev/null
++@@ -1,51 +0,0 @@
++-"""Test than modules in eventlet.green package are indeed green.
++-To do that spawn a green server and then access it using a green socket.
++-If either operation blocked the whole script would block and timeout.
++-"""
++-import eventlet
++-from eventlet.green import BaseHTTPServer
++-from eventlet.support import six
++-
++-if six.PY2:
++-    from eventlet.green.urllib2 import HTTPError, urlopen
++-else:
++-    from eventlet.green.urllib.request import urlopen
++-    from eventlet.green.urllib.error import HTTPError
++-
++-
++-class QuietHandler(BaseHTTPServer.BaseHTTPRequestHandler):
++-    protocol_version = "HTTP/1.0"
++-
++-    def log_message(self, *args, **kw):
++-        pass
++-
++-
++-def start_http_server():
++-    server_address = ('localhost', 0)
++-    httpd = BaseHTTPServer.HTTPServer(server_address, QuietHandler)
++-    sa = httpd.socket.getsockname()
++-    # print("Serving HTTP on", sa[0], "port", sa[1], "...")
++-    httpd.request_count = 0
++-
++-    def serve():
++-        # increment the request_count before handling the request because
++-        # the send() for the response blocks (or at least appeared to be)
++-        httpd.request_count += 1
++-        httpd.handle_request()
++-    return eventlet.spawn(serve), httpd, sa[1]
++-
++-
++-def test_urllib():
++-    gthread, server, port = start_http_server()
++-
++-    try:
++-        assert server.request_count == 0
++-        try:
++-            urlopen('http://127.0.0.1:{0}'.format(port))
++-            assert False, 'should not get there'
++-        except HTTPError as ex:
++-            assert ex.code == 501, repr(ex)
++-        assert server.request_count == 1
++-    finally:
++-        server.server_close()
++-        eventlet.kill(gthread)
diff --cc debian/patches/series
index 0543c7e,0000000..f00ff61
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,9 @@@
 +0001-Removes-line-that-is-doing-FTBFS-in-doc.patch
 +0002-Fixed-privacy-breach-in-examples.patch
 +0003-Allow-more-busy-CPU.patch
 +0004-Remove-networking-tests.patch
 +0005-Removed-failing-test.patch
 +0006-Patch-out-intersphinx.patch
 +0007-Patched-test_getaddrinfo-due-netbase-update.patch
 +0008-Disable-test_server_connection_timeout_exception.patch
++0009-Removed-test_urllib-that-is-failing-in-py36.patch

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