From 8b0725d7fbd6bbb02dadc8f80699e761a864ef35 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Wed, 8 Jan 2014 13:45:31 +1300
Subject: [PATCH] Use assertRaises instead of try/except/else

Change-Id: I8b1105404511c003e032f03777ce85325abbe0cd
---
 heatclient/tests/test_shell.py | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/heatclient/tests/test_shell.py b/heatclient/tests/test_shell.py
index cc80843f..36788af6 100644
--- a/heatclient/tests/test_shell.py
+++ b/heatclient/tests/test_shell.py
@@ -67,18 +67,13 @@ class TestCase(testtools.TestCase):
 
     def shell_error(self, argstr, error_match):
         orig = sys.stderr
-        try:
-            sys.stderr = six.StringIO()
-            _shell = heatclient.shell.HeatShell()
-            _shell.main(argstr.split())
-        except Exception as e:
-            self.assertRegexpMatches(e.__str__(), error_match)
-        else:
-            self.fail('Expected error matching: %s' % error_match)
-        finally:
-            err = sys.stderr.getvalue()
-            sys.stderr.close()
-            sys.stderr = orig
+        sys.stderr = six.StringIO()
+        _shell = heatclient.shell.HeatShell()
+        e = self.assertRaises(Exception, _shell.main, argstr.split())
+        self.assertRegexpMatches(e.__str__(), error_match)
+        err = sys.stderr.getvalue()
+        sys.stderr.close()
+        sys.stderr = orig
         return err