PYTHON-1831 Fix spec test parsing of returnDocument argument

Author: ShaneHarvey

test/test_crud_v1.py

@@ -122,7 +122,7 @@ def run_operation(collection, test):
                 continue
             # Requires boolean returnDocument.
             elif arg_name == "returnDocument":
-                arguments[c2s] = arguments[arg_name] == "After"
+                arguments[c2s] = arguments.pop(arg_name) == "After"
             else:
                 arguments[c2s] = arguments.pop(arg_name)
 

test/test_crud_v2.py

@@ -93,7 +93,7 @@ def run_operation(self, collection, test):
                         continue
                     # Requires boolean returnDocument.
                     elif arg_name == "returnDocument":
-                        arguments[c2s] = arguments[arg_name] == "After"
+                        arguments[c2s] = arguments.pop(arg_name) == "After"
                     else:
                         arguments[c2s] = arguments.pop(arg_name)
 

test/utils_spec_runner.py

@@ -238,7 +238,7 @@ def parse_options(opts):
                 continue
             # Requires boolean returnDocument.
             elif arg_name == "returnDocument":
-                arguments[c2s] = arguments[arg_name] == "After"
+                arguments[c2s] = arguments.pop(arg_name) == "After"
             elif c2s == "requests":
                 # Parse each request into a bulk write model.
                 requests = []