From: Victor Stinner <victor.stinner@gmail.com>
Date: Sun, 14 Apr 2013 14:43:03 +0000 (+0200)
Subject: Issue #17702: use assertRaises() for the unit test
X-Git-Tag: v3.3.2~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=839e5eafcb351178983c2f603152091d03d60831;p=thirdparty%2FPython%2Fcpython.git

Issue #17702: use assertRaises() for the unit test
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 83373be96e64..33b9e5b87e62 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -636,19 +636,13 @@ class EnvironTests(mapping_tests.BasicTestMappingProtocol):
         missing = 'missingkey'
         self.assertNotIn(missing, os.environ)
 
-        try:
+        with self.assertRaises(KeyError) as cm:
             os.environ[missing]
-        except KeyError as err:
-            self.assertIs(err.args[0], missing)
-        else:
-            self.fail("KeyError not raised")
+        self.assertIs(cm.exception.args[0], missing)
 
-        try:
+        with self.assertRaises(KeyError) as cm:
             del os.environ[missing]
-        except KeyError as err:
-            self.assertIs(err.args[0], missing)
-        else:
-            self.fail("KeyError not raised")
+        self.assertIs(cm.exception.args[0], missing)
 
 class WalkTests(unittest.TestCase):
     """Tests for os.walk()."""