[pypy-commit] pypy stdlib-2.7.3: I don't know whether this test was about a bad host name or a bad IPv4 sockaddr,

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: stdlib-2.7.3
Changeset: r55706:a1dce4ded37c
Date: 2012-06-17 22:18 +0200
http://bitbucket.org/pypy/pypy/changeset/a1dce4ded37c/

Log:	I don't know whether this test was about a bad host name or a bad
	IPv4 sockaddr, but at least pypy does not segfault here.

diff --git a/lib-python/2.7/test/test_socket.py b/lib-python/2.7/test/test_socket.py
--- a/lib-python/2.7/test/test_socket.py
+++ b/lib-python/2.7/test/test_socket.py
@@ -361,8 +361,8 @@
         try:
             # On some versions, this crashes the interpreter.
             socket.getnameinfo(('x', 0, 0, 0), 0)
-        except socket.error as e:
-            self.assertEqual(str(e), 'IPv4 sockaddr must be 2 tuple')
+        except socket.error:
+            pass
 
     def testNtoH(self):
         # This just checks that htons etc. are their own inverse,