modified assertRaises test to work with async pt2

Author: sleepyStick

test/asynchronous/test_auth.py

@@ -332,8 +332,10 @@ def auth_string(user, password):
         bad_user = AsyncMongoClient(auth_string("not-user", SASL_PASS))
         bad_pwd = AsyncMongoClient(auth_string(SASL_USER, "not-pwd"))
         # OperationFailure raised upon connecting.
-        self.assertRaises(OperationFailure, bad_user.admin.command, "ping")
-        self.assertRaises(OperationFailure, bad_pwd.admin.command, "ping")
+        with self.assertRaises(OperationFailure):
+            await bad_user.admin.command("ping")
+        with self.assertRaises(OperationFailure):
+            await bad_pwd.admin.command("ping")
 
 
 class TestSCRAMSHA1(AsyncIntegrationTest):
@@ -654,15 +656,17 @@ async def test_uri_options(self):
                 async_client_context.replica_set_name,
             )
             client = await async_single_client_noauth(uri)
-            self.assertRaises(OperationFailure, client.admin.command, "dbstats")
+            with self.assertRaises(OperationFailure):
+                await client.admin.command("dbstats")
             self.assertTrue(await client.pymongo_test.command("dbstats"))
             db = client.get_database("pymongo_test", read_preference=ReadPreference.SECONDARY)
             self.assertTrue(await db.command("dbstats"))
 
         # Test authSource
         uri = "mongodb://user:pass@%s:%d/pymongo_test2?authSource=pymongo_test" % (host, port)
         client = await async_rs_or_single_client_noauth(uri)
-        self.assertRaises(OperationFailure, client.pymongo_test2.command, "dbstats")
+        with self.assertRaises(OperationFailure):
+            await client.pymongo_test2.command("dbstats")
         self.assertTrue(await client.pymongo_test.command("dbstats"))
 
         if async_client_context.is_rs:
@@ -671,7 +675,8 @@ async def test_uri_options(self):
                 "%s;authSource=pymongo_test" % (host, port, async_client_context.replica_set_name)
             )
             client = await async_single_client_noauth(uri)
-            self.assertRaises(OperationFailure, client.pymongo_test2.command, "dbstats")
+            with self.assertRaises(OperationFailure):
+                await client.pymongo_test2.command("dbstats")
             self.assertTrue(await client.pymongo_test.command("dbstats"))
             db = client.get_database("pymongo_test", read_preference=ReadPreference.SECONDARY)
             self.assertTrue(await db.command("dbstats"))

test/test_auth.py

@@ -332,8 +332,10 @@ def auth_string(user, password):
         bad_user = MongoClient(auth_string("not-user", SASL_PASS))
         bad_pwd = MongoClient(auth_string(SASL_USER, "not-pwd"))
         # OperationFailure raised upon connecting.
-        self.assertRaises(OperationFailure, bad_user.admin.command, "ping")
-        self.assertRaises(OperationFailure, bad_pwd.admin.command, "ping")
+        with self.assertRaises(OperationFailure):
+            bad_user.admin.command("ping")
+        with self.assertRaises(OperationFailure):
+            bad_pwd.admin.command("ping")
 
 
 class TestSCRAMSHA1(IntegrationTest):
@@ -642,15 +644,17 @@ def test_uri_options(self):
                 client_context.replica_set_name,
             )
             client = single_client_noauth(uri)
-            self.assertRaises(OperationFailure, client.admin.command, "dbstats")
+            with self.assertRaises(OperationFailure):
+                client.admin.command("dbstats")
             self.assertTrue(client.pymongo_test.command("dbstats"))
             db = client.get_database("pymongo_test", read_preference=ReadPreference.SECONDARY)
             self.assertTrue(db.command("dbstats"))
 
         # Test authSource
         uri = "mongodb://user:pass@%s:%d/pymongo_test2?authSource=pymongo_test" % (host, port)
         client = rs_or_single_client_noauth(uri)
-        self.assertRaises(OperationFailure, client.pymongo_test2.command, "dbstats")
+        with self.assertRaises(OperationFailure):
+            client.pymongo_test2.command("dbstats")
         self.assertTrue(client.pymongo_test.command("dbstats"))
 
         if client_context.is_rs:
@@ -659,7 +663,8 @@ def test_uri_options(self):
                 "%s;authSource=pymongo_test" % (host, port, client_context.replica_set_name)
             )
             client = single_client_noauth(uri)
-            self.assertRaises(OperationFailure, client.pymongo_test2.command, "dbstats")
+            with self.assertRaises(OperationFailure):
+                client.pymongo_test2.command("dbstats")
             self.assertTrue(client.pymongo_test.command("dbstats"))
             db = client.get_database("pymongo_test", read_preference=ReadPreference.SECONDARY)
             self.assertTrue(db.command("dbstats"))