Fix _require

Author: NoahStapp

test/__init__.py

@@ -464,11 +464,12 @@ def wrap(*args, **kwargs):
                 if not self.connected:
                     pair = self.pair
                     raise SkipTest(f"Cannot connect to MongoDB on {pair}")
-                if iscoroutinefunction(condition) and condition():
-                    if wraps_async:
-                        return f(*args, **kwargs)
-                    else:
-                        return f(*args, **kwargs)
+                if iscoroutinefunction(condition):
+                    if condition():
+                        if wraps_async:
+                            return f(*args, **kwargs)
+                        else:
+                            return f(*args, **kwargs)
                 elif condition():
                     if wraps_async:
                         return f(*args, **kwargs)

test/asynchronous/__init__.py

@@ -466,11 +466,12 @@ async def wrap(*args, **kwargs):
                 if not self.connected:
                     pair = await self.pair
                     raise SkipTest(f"Cannot connect to MongoDB on {pair}")
-                if iscoroutinefunction(condition) and await condition():
-                    if wraps_async:
-                        return await f(*args, **kwargs)
-                    else:
-                        return f(*args, **kwargs)
+                if iscoroutinefunction(condition):
+                    if await condition():
+                        if wraps_async:
+                            return await f(*args, **kwargs)
+                        else:
+                            return f(*args, **kwargs)
                 elif condition():
                     if wraps_async:
                         return await f(*args, **kwargs)

test/asynchronous/utils_spec_runner.py

@@ -180,24 +180,19 @@ def serverless_ok(run_on_req):
 
     async def should_run_on(self, scenario_def):
         run_on = scenario_def.get("runOn", [])
-        print(f"RUN_ON: {run_on}")
         if not run_on:
             # Always run these tests.
             return True
 
         for req in run_on:
-            print(f"REQ: {req}")
             if (
                 await self.valid_topology(req)
                 and self.min_server_version(req)
                 and self.max_server_version(req)
                 and self.valid_auth_enabled(req)
                 and self.serverless_ok(req)
             ):
-                print(f"REQ passes: {req}")
                 return True
-            else:
-                print(f"REQ fails: {req}")
         return False
 
     def ensure_run_on(self, scenario_def, method):
@@ -206,7 +201,7 @@ def ensure_run_on(self, scenario_def, method):
         async def predicate():
             return await self.should_run_on(scenario_def)
 
-        return async_client_context._require(lambda: predicate, "runOn not satisfied", method)
+        return async_client_context._require(predicate, "runOn not satisfied", method)
 
     def tests(self, scenario_def):
         """Allow CMAP spec test to override the location of test."""

test/utils_spec_runner.py

@@ -180,24 +180,19 @@ def serverless_ok(run_on_req):
 
     def should_run_on(self, scenario_def):
         run_on = scenario_def.get("runOn", [])
-        print(f"RUN_ON: {run_on}")
         if not run_on:
             # Always run these tests.
             return True
 
         for req in run_on:
-            print(f"REQ: {req}")
             if (
                 self.valid_topology(req)
                 and self.min_server_version(req)
                 and self.max_server_version(req)
                 and self.valid_auth_enabled(req)
                 and self.serverless_ok(req)
             ):
-                print(f"REQ passes: {req}")
                 return True
-            else:
-                print(f"REQ fails: {req}")
         return False
 
     def ensure_run_on(self, scenario_def, method):
@@ -206,7 +201,7 @@ def ensure_run_on(self, scenario_def, method):
         def predicate():
             return self.should_run_on(scenario_def)
 
-        return client_context._require(lambda: predicate, "runOn not satisfied", method)
+        return client_context._require(predicate, "runOn not satisfied", method)
 
     def tests(self, scenario_def):
         """Allow CMAP spec test to override the location of test."""