[pypy-commit] pypy default: Changeset by tumbleweed: we are seeing this on Linux too,

arigo noreply at buildbot.pypy.org
Wed Dec 14 18:07:56 CET 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r50511:b907a1252c68
Date: 2011-12-14 18:05 +0100
http://bitbucket.org/pypy/pypy/changeset/b907a1252c68/

Log:	Changeset by tumbleweed: we are seeing this on Linux too, not only
	on Darwin. Obscure.

diff --git a/pypy/module/_ssl/test/test_ssl.py b/pypy/module/_ssl/test/test_ssl.py
--- a/pypy/module/_ssl/test/test_ssl.py
+++ b/pypy/module/_ssl/test/test_ssl.py
@@ -161,11 +161,16 @@
 
     def test_shutdown(self):
         import socket, ssl, sys, gc
-        if sys.platform == 'darwin':
-            skip("get also on CPython: error: [Errno 0]")
         ss = socket.ssl(self.s)
         ss.write("hello\n")
-        assert ss.shutdown() is self.s._sock
+        try:
+            result = ss.shutdown()
+        except socket.error, e:
+            # xxx obscure case; throwing errno 0 is pretty odd...
+            if e.errno == 0:
+                skip("Shutdown raised errno 0. CPython does this too")
+            raise
+        assert result is self.s._sock
         raises(ssl.SSLError, ss.write, "hello\n")
         del ss; gc.collect()
 


More information about the pypy-commit mailing list