[Python-modules-commits] r30185 - in packages/pyopenssl/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Sunday, August 17, 2014 @ 18:41:33
  Author: morph
Revision: 30185

* debian/patches/bbff8b97da488d19d3a26f6eda5f83fc88ad430c.patch
  - fixes test_wantWriteError error

Added:
  packages/pyopenssl/trunk/debian/patches/bbff8b97da488d19d3a26f6eda5f83fc88ad430c.patch
Modified:
  packages/pyopenssl/trunk/debian/changelog
  packages/pyopenssl/trunk/debian/patches/series

Modified: packages/pyopenssl/trunk/debian/changelog
===================================================================
--- packages/pyopenssl/trunk/debian/changelog	2014-08-17 13:10:37 UTC (rev 30184)
+++ packages/pyopenssl/trunk/debian/changelog	2014-08-17 18:41:33 UTC (rev 30185)
@@ -13,8 +13,10 @@
   * Build and install doc with Sphinx
   * debian/{control, *-dbg.install}
     - removed dbg package, no longer created
+  * debian/patches/bbff8b97da488d19d3a26f6eda5f83fc88ad430c.patch
+    - fixes test_wantWriteError error
 
- -- Sandro Tosi <morph at debian.org>  Sat, 16 Aug 2014 23:12:52 +0100
+ -- Sandro Tosi <morph at debian.org>  Sun, 17 Aug 2014 19:41:18 +0100
 
 pyopenssl (0.13.1-2) unstable; urgency=medium
 

Added: packages/pyopenssl/trunk/debian/patches/bbff8b97da488d19d3a26f6eda5f83fc88ad430c.patch
===================================================================
--- packages/pyopenssl/trunk/debian/patches/bbff8b97da488d19d3a26f6eda5f83fc88ad430c.patch	                        (rev 0)
+++ packages/pyopenssl/trunk/debian/patches/bbff8b97da488d19d3a26f6eda5f83fc88ad430c.patch	2014-08-17 18:41:33 UTC (rev 30185)
@@ -0,0 +1,35 @@
+From bbff8b97da488d19d3a26f6eda5f83fc88ad430c Mon Sep 17 00:00:00 2001
+From: Jean-Paul Calderone <exarkun at twistedmatrix.com>
+Date: Sat, 22 Mar 2014 14:20:30 -0400
+Subject: [PATCH] Only write one byte at a time and try to write many more
+ bytes overall.
+
+Hopefully this addresses FreeBSD and Gentoo issues with this test.
+---
+ OpenSSL/test/test_ssl.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/OpenSSL/test/test_ssl.py b/OpenSSL/test/test_ssl.py
+index a6f0127..1f62e49 100644
+--- a/OpenSSL/test/test_ssl.py
++++ b/OpenSSL/test/test_ssl.py
+@@ -1911,9 +1911,13 @@ def test_wantWriteError(self):
+         """
+         client_socket, server_socket = socket_pair()
+         # Fill up the client's send buffer so Connection won't be able to write
+-        # anything.
+-        msg = b"x" * 512
+-        for i in range(2048):
++        # anything.  Only write a single byte at a time so we can be sure we
++        # completely fill the buffer.  Even though the socket API is allowed to
++        # signal a short write via its return value it seems this doesn't
++        # always happen on all platforms (FreeBSD and OS X particular) for the
++        # very last bit of available buffer space.
++        msg = b"x"
++        for i in range(1024 * 1024 * 4):
+             try:
+                 client_socket.send(msg)
+             except error as e:
+-- 
+2.0.3
+

Modified: packages/pyopenssl/trunk/debian/patches/series
===================================================================
--- packages/pyopenssl/trunk/debian/patches/series	2014-08-17 13:10:37 UTC (rev 30184)
+++ packages/pyopenssl/trunk/debian/patches/series	2014-08-17 18:41:33 UTC (rev 30185)
@@ -1 +1,2 @@
 disable_test_set_default_verify_paths.patch
+bbff8b97da488d19d3a26f6eda5f83fc88ad430c.patch