[server] raise exceptions in try-else block for views.py

iblislin · iblislin · commit 13f6c8d1690d · 2016-10-25T09:31:29.000+08:00
Reference: #268 See Also: #276
diff --git a/couchdb/tests/server/views.py b/couchdb/tests/server/views.py
@@ -55,9 +55,11 @@ def test_rethrow_viewserver_exception_as_is(self):
         try:
             views.map_doc(self.server, {'_id': 'foo'})
         except Exception as err:
-            self.assertTrue(err, exceptions.FatalError)
+            self.assertTrue(isinstance(err, exceptions.FatalError))
             self.assertEqual(err.args[0], 'test')
             self.assertEqual(err.args[1], 'let it crush!')
+        else:
+            self.fail('FatalError exception expected')
 
     def test_raise_error_exception_on_any_python_one(self):
         """should raise QS Error exception on any Python one"""
@@ -69,8 +71,10 @@ def test_raise_error_exception_on_any_python_one(self):
         try:
             views.map_doc(self.server, {'_id': 'foo'})
         except Exception as err:
-            self.assertTrue(err, exceptions.Error)
+            self.assertTrue(isinstance(err, exceptions.Error))
             self.assertEqual(err.args[0], ZeroDivisionError.__name__)
+        else:
+            self.fail('Error exception expected')
 
     def test_map_function_shouldnt_change_document(self):
         """should prevent document changing within map function"""
@@ -131,6 +135,8 @@ def test_yield_non_iterable(self):
         except exceptions.Error as err:
             self.assertTrue('invalid value' in err.args[0])
             self.assertTrue('`42`' in err.args[0])
+        else:
+            self.fail('Error exception expected')
 
     def test_yield_non_pair(self):
         """should raise Error if map function do not yield pair"""
@@ -146,6 +152,8 @@ def test_yield_non_pair(self):
         except exceptions.Error as err:
             self.assertTrue('invalid value' in err.args[0])
             self.assertTrue('`[42]`' in err.args[0])
+        else:
+            self.fail('Error exception expected')
 
     def test_yield_str_type(self):
         """should raise Error if map function yield a string"""
@@ -160,6 +168,8 @@ def test_yield_str_type(self):
             views.map_doc(self.server, doc)
         except exceptions.Error as err:
             self.assertTrue('not a string' in err.args[0])
+        else:
+            self.fail('Error exception expected')
 
     def test_return_non_iterable(self):
         """should raise Error
@@ -175,6 +185,8 @@ def test_return_non_iterable(self):
         except exceptions.Error as err:
             self.assertTrue('invalid value' in err.args[0])
             self.assertTrue('`42`' in err.args[0])
+        else:
+            self.fail('Error exception expected')
 
     def test_return_non_pair(self):
         """should raise Error if map function return a serise contain non-pair"""
@@ -189,6 +201,8 @@ def test_return_non_pair(self):
         except exceptions.Error as err:
             self.assertTrue('invalid value' in err.args[0])
             self.assertTrue('[42]' in err.args[0])
+        else:
+            self.fail('Error exception expected')
 
     def test_return_str_type(self):
         """should raise Error if map function return a serise contain string"""
@@ -202,6 +216,8 @@ def test_return_str_type(self):
             views.map_doc(self.server, doc)
         except exceptions.Error as err:
             self.assertTrue('not a string' in err.args[0])
+        else:
+            self.fail('Error exception expected')
 
 
 class ReduceTestCase(unittest.TestCase):
@@ -284,7 +300,7 @@ def test_raise_error_exception_on_any_python_one(self):
                 [['foo', 'bar'], ['bar', 'baz']]
             )
         except Exception as err:
-            self.assertTrue(err, exceptions.Error)
+            self.assertTrue(isinstance(err, exceptions.Error))
             self.assertEqual(err.args[0], NameError.__name__)
 
     def test_reduce_empty_map_result(self):
