[pypy-svn] r72436 - in pypy/branch/kill-python-h/pypy/rlib: . test

[arigo at codespeak.net]

Author: arigo
Date: Sat Mar 20 09:43:31 2010
New Revision: 72436

Modified:
   pypy/branch/kill-python-h/pypy/rlib/_rsocket_rffi.py
   pypy/branch/kill-python-h/pypy/rlib/test/test_rsocket.py
Log:
Test and fix.


Modified: pypy/branch/kill-python-h/pypy/rlib/_rsocket_rffi.py
==============================================================================
--- pypy/branch/kill-python-h/pypy/rlib/_rsocket_rffi.py	(original)
+++ pypy/branch/kill-python-h/pypy/rlib/_rsocket_rffi.py	Sat Mar 20 09:43:31 2010
@@ -572,4 +572,4 @@
 else:
     socket_strerror_str = os.strerror
     def gai_strerror_str(errno):
-        return rffi.charp2str(gai_strerror(self.errno))
+        return rffi.charp2str(gai_strerror(errno))

Modified: pypy/branch/kill-python-h/pypy/rlib/test/test_rsocket.py
==============================================================================
--- pypy/branch/kill-python-h/pypy/rlib/test/test_rsocket.py	(original)
+++ pypy/branch/kill-python-h/pypy/rlib/test/test_rsocket.py	Sat Mar 20 09:43:31 2010
@@ -281,7 +281,8 @@
             addr.get_port() == 80):
             found = True
     assert found, lst
-    py.test.raises(GAIError, getaddrinfo, 'www.very-invalidaddress.com', None)
+    e = py.test.raises(GAIError, getaddrinfo, 'www.very-invalidaddress.com', None)
+    assert isinstance(e.value.get_msg(), str)
 
 def test_getaddrinfo_codespeak():
     lst = getaddrinfo('codespeak.net', None)