commit 672559fc4f6d3811440965a12d900209f364b5f0
author Victor Stinner <victor.stinner@gmail.com> Sun Apr 14 16:43:38 2013 +0200
committer Victor Stinner <victor.stinner@gmail.com> Sun Apr 14 16:43:38 2013 +0200
tree 979d08d55b6658e412461824dffa35a3cb6a6028
parent 43aa0d07e2ab93bde71fb2dd5d300fef524b36cd
parent 839e5eafcb351178983c2f603152091d03d60831

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

Lib/test/test_os.py

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index e6aae5c..3a38285 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -636,19 +636,13 @@
         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()."""