From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 14 Sep 2010 21:24:25 +0000 (+0000)
Subject: Make testDefaults in test.test_socket.BasicSocketPairTest more reliable.
X-Git-Tag: v3.2a3~262
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e55fec14c7e91d17760b966f19c41634b5a12fd;p=thirdparty%2FPython%2Fcpython.git

Make testDefaults in test.test_socket.BasicSocketPairTest more reliable.
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 690d9b5ee508..718ea5c595de 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -815,22 +815,20 @@ class BasicSocketPairTest(SocketPairTest):
     def __init__(self, methodName='runTest'):
         SocketPairTest.__init__(self, methodName=methodName)
 
+    def _check_defaults(self, sock):
+        self.assertIsInstance(sock, socket.socket)
+        if hasattr(socket, 'AF_UNIX'):
+            self.assertEqual(sock.family, socket.AF_UNIX)
+        else:
+            self.assertEqual(sock.family, socket.AF_INET)
+        self.assertEqual(sock.type, socket.SOCK_STREAM)
+        self.assertEqual(sock.proto, 0)
+
     def _testDefaults(self):
-        pass
+        self._check_defaults(self.cli)
 
     def testDefaults(self):
-        self.assertIsInstance(self.cli, socket.socket)
-        self.assertIsInstance(self.serv, socket.socket)
-        if hasattr(socket, 'AF_UNIX'):
-            self.assertEqual(self.cli.family, socket.AF_UNIX)
-            self.assertEqual(self.serv.family, socket.AF_UNIX)
-        else:
-            self.assertEqual(self.cli.family, socket.AF_INET)
-            self.assertEqual(self.serv.family, socket.AF_INET)
-        self.assertEqual(self.cli.type, socket.SOCK_STREAM)
-        self.assertEqual(self.serv.type, socket.SOCK_STREAM)
-        self.assertEqual(self.cli.proto, 0)
-        self.assertEqual(self.serv.proto, 0)
+        self._check_defaults(self.serv)
 
     def testRecv(self):
         msg = self.serv.recv(1024)