From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 8 May 2011 17:23:57 +0000 (+0300)
Subject: Refactor buggy test to correctly use the msg argument of assertRaises.
X-Git-Tag: v3.3.0a1~2358
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=845f1526a301d160d4eec0ce3663a4d645b86493;p=python

Refactor buggy test to correctly use the msg argument of assertRaises.
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 8a6a780663..c811ec445c 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -270,18 +270,13 @@ class GeneralModuleTests(unittest.TestCase):
 
     def testSocketError(self):
         # Testing socket module exceptions
-        def raise_error(*args, **kwargs):
+        msg = "Error raising socket exception (%s)."
+        with self.assertRaises(socket.error, msg=msg % 'socket.error'):
             raise socket.error
-        def raise_herror(*args, **kwargs):
+        with self.assertRaises(socket.error, msg=msg % 'socket.herror'):
             raise socket.herror
-        def raise_gaierror(*args, **kwargs):
+        with self.assertRaises(socket.error, msg=msg % 'socket.gaierror'):
             raise socket.gaierror
-        self.assertRaises(socket.error, raise_error,
-                              "Error raising socket exception.")
-        self.assertRaises(socket.error, raise_herror,
-                              "Error raising socket exception.")
-        self.assertRaises(socket.error, raise_gaierror,
-                              "Error raising socket exception.")
 
     def testSendtoErrors(self):
         # Testing that sendto doens't masks failures. See #10169.