PYTHON-766 Python 2.4-compatible test for parsing mongos errors.

ajdavis · ajdavis · commit 2c6ecb490a2d · 2014-10-09T11:30:47.000-04:00
diff --git a/test/test_database.py b/test/test_database.py
@@ -658,10 +658,12 @@ def test_mongos_response(self):
             'errmsg': 'outer',
             'raw': {'shard0/host0,host1': {'ok': 0, 'errmsg': 'inner'}}}
 
-        with self.assertRaises(OperationFailure) as context:
+        try:
             helpers._check_command_response(error_document, reset=None)
-
-        self.assertEqual('inner', str(context.exception))
+        except OperationFailure, exc:
+            self.assertEqual('inner', str(exc))
+        else:
+            self.fail('OperationFailure not raised')
 
         # If a shard has no primary and you run a command like dbstats, which
         # cannot be run on a secondary, mongos's response includes empty "raw"
@@ -671,21 +673,25 @@ def test_mongos_response(self):
             'errmsg': 'outer',
             'raw': {'shard0/host0,host1': {}}}
 
-        with self.assertRaises(OperationFailure) as context:
+        try:
             helpers._check_command_response(error_document, reset=None)
-
-        self.assertEqual('outer', str(context.exception))
+        except OperationFailure, exc:
+            self.assertEqual('outer', str(exc))
+        else:
+            self.fail('OperationFailure not raised')
 
         # Raw error has ok: 0 but no errmsg. Not a known case, but test it.
         error_document = {
             'ok': 0,
             'errmsg': 'outer',
             'raw': {'shard0/host0,host1': {'ok': 0}}}
 
-        with self.assertRaises(OperationFailure) as context:
+        try:
             helpers._check_command_response(error_document, reset=None)
-
-        self.assertEqual('outer', str(context.exception))
+        except OperationFailure, exc:
+            self.assertEqual('outer', str(exc))
+        else:
+            self.fail('OperationFailure not raised')
 
     def test_command_read_pref_warning(self):
         ctx = catch_warnings()
