Use assertRaises instead of try/except blocks for unit tests

boto · Aug 1, 2013 · 4407fcb · 4407fcb
1 parent 915d8ff
commit 4407fcb
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/tests/unit/cloudsearch/test_exceptions.py b/tests/unit/cloudsearch/test_exceptions.py
@@ -24,20 +24,14 @@ def test_no_simplejson_value_error(self):
         with mock.patch.object(json, 'loads', fake_loads_value_error):
             search = SearchConnection(endpoint=HOSTNAME)
 
-            try:
+            with self.assertRaisesRegexp(SearchServiceException, 'non-json'):
                 search.search(q='test')
-                self.fail('This should never run!')
-            except SearchServiceException, err:
-                self.assertTrue('non-json' in str(err))
 
     @unittest.skipUnless(hasattr(json, 'JSONDecodeError'),
                          'requires simplejson')
     def test_simplejson_jsondecodeerror(self):
         with mock.patch.object(json, 'loads', fake_loads_json_error):
             search = SearchConnection(endpoint=HOSTNAME)
 
-            try:
+            with self.assertRaisesRegexp(SearchServiceException, 'non-json'):
                 search.search(q='test')
-                self.fail('This should never run!')
-            except SearchServiceException, err:
-                self.assertTrue('non-json' in str(err))