[Python-checkins] cpython (3.3): Issue #17702: use assertRaises() for the unit test

[victor.stinner]

http://hg.python.org/cpython/rev/b0c002fa4335
changeset:   83371:b0c002fa4335
branch:      3.3
parent:      83369:72df981e83d3
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sun Apr 14 16:43:03 2013 +0200
summary:
  Issue #17702: use assertRaises() for the unit test

files:
  Lib/test/test_os.py |  14 ++++----------
  1 files changed, 4 insertions(+), 10 deletions(-)


diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- 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()."""

-- 
Repository URL: http://hg.python.org/cpython