[pypy-commit] pypy default: Fix tests in the _ssl module

amauryfa noreply at buildbot.pypy.org
Sun May 15 18:05:39 CEST 2011


Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r44179:8e8463e113ae
Date: 2011-05-15 18:04 +0200
http://bitbucket.org/pypy/pypy/changeset/8e8463e113ae/

Log:	Fix tests in the _ssl module

diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/module/_ssl/interp_ssl.py
@@ -899,7 +899,7 @@
 
 def _ssl_thread_id_function():
     from pypy.module.thread import ll_thread
-    return ll_thread.get_ident()
+    return rffi.cast(rffi.INT, ll_thread.get_ident())
 
 def setup_ssl_threads():
     from pypy.module.thread import ll_thread
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
@@ -81,7 +81,7 @@
         ss = _ssl.sslwrap(s, 0)
         s.close()
         exc = raises(_ssl.SSLError, ss.write, "data")
-        assert exc.value.message == "Underlying socket has been closed."
+        assert exc.value.strerror == "Underlying socket has been closed."
 
 
 class AppTestConnectedSSL:


More information about the pypy-commit mailing list