Test aggregate in transactions

Author: ajdavis

test/test_transactions.py

@@ -88,10 +88,7 @@ def test_transaction_options_validation(self):
 
  # TODO: factor the following function with test_crud.py.
  def check_result(self, expected_result, result):
- if isinstance(result, Cursor) or isinstance(result, CommandCursor):
- self.assertEqual(list(result), expected_result)
-
- elif isinstance(result, _WriteResult):
+ if isinstance(result, _WriteResult):
  for res in expected_result:
  prop = camel_to_snake(res)
  # SPEC-869: Only BulkWriteResult has upserted_count.
@@ -178,7 +175,7 @@ def run_operation(self, sessions, collection, operation):
  if arg_name == "fieldName":
  arguments["key"] = arguments.pop(arg_name)
  # Aggregate uses "batchSize", while find uses batch_size.
- elif arg_name == "batchSize" and operation == "aggregate":
+ elif arg_name == "batchSize" and name == "aggregate":
  continue
  # Requires boolean returnDocument.
  elif arg_name == "returnDocument":
@@ -197,11 +194,14 @@ def run_operation(self, sessions, collection, operation):
 
  result = cmd(**arguments)
 
- if operation == "aggregate":
+ if name == "aggregate":
  if arguments["pipeline"] and "$out" in arguments["pipeline"][-1]:
  out = collection.database[arguments["pipeline"][-1]["$out"]]
  return out.find()
 
+ if isinstance(result, Cursor) or isinstance(result, CommandCursor):
+ return list(result)
+
  return result
 
  # TODO: factor with test_command_monitoring.py

test/transactions/reads.json

@@ -300,6 +300,209 @@
  }
  }
  },
+ {
+ "description": "aggregate",
+ "operations": [
+ {
+ "name": "startTransaction",
+ "arguments": {
+ "session": "session0"
+ }
+ },
+ {
+ "name": "aggregate",
+ "arguments": {
+ "pipeline": [
+ {
+ "$project": {
+ "_id": 1
+ }
+ }
+ ],
+ "batchSize": 3,
+ "session": "session0"
+ },
+ "result": [
+ {
+ "_id": 1
+ },
+ {
+ "_id": 2
+ },
+ {
+ "_id": 3
+ },
+ {
+ "_id": 4
+ }
+ ]
+ },
+ {
+ "name": "aggregate",
+ "arguments": {
+ "pipeline": [
+ {
+ "$project": {
+ "_id": 1
+ }
+ }
+ ],
+ "batchSize": 3,
+ "session": "session0"
+ },
+ "result": [
+ {
+ "_id": 1
+ },
+ {
+ "_id": 2
+ },
+ {
+ "_id": 3
+ },
+ {
+ "_id": 4
+ }
+ ]
+ },
+ {
+ "name": "commitTransaction",
+ "arguments": {
+ "session": "session0"
+ }
+ }
+ ],
+ "expectations": [
+ {
+ "command_started_event": {
+ "command": {
+ "aggregate": "test",
+ "pipeline": [
+ {
+ "$project": {
+ "_id": 1
+ }
+ }
+ ],
+ "cursor": {
+ "batchSize": 3
+ },
+ "readConcern": null,
+ "lsid": "session0",
+ "txnNumber": {
+ "$numberLong": "1"
+ },
+ "stmtId": 0,
+ "startTransaction": true,
+ "autocommit": false
+ },
+ "command_name": "aggregate",
+ "database_name": "transaction-tests"
+ }
+ },
+ {
+ "command_started_event": {
+ "command": {
+ "getMore": {
+ "$numberLong": "42"
+ },
+ "collection": "test",
+ "batchSize": 3,
+ "lsid": "session0",
+ "txnNumber": {
+ "$numberLong": "1"
+ },
+ "stmtId": 1,
+ "startTransaction": null,
+ "autocommit": false
+ },
+ "command_name": "getMore",
+ "database_name": "transaction-tests"
+ }
+ },
+ {
+ "command_started_event": {
+ "command": {
+ "aggregate": "test",
+ "pipeline": [
+ {
+ "$project": {
+ "_id": 1
+ }
+ }
+ ],
+ "cursor": {
+ "batchSize": 3
+ },
+ "lsid": "session0",
+ "txnNumber": {
+ "$numberLong": "1"
+ },
+ "stmtId": 2,
+ "startTransaction": null,
+ "autocommit": false
+ },
+ "command_name": "aggregate",
+ "database_name": "transaction-tests"
+ }
+ },
+ {
+ "command_started_event": {
+ "command": {
+ "getMore": {
+ "$numberLong": "42"
+ },
+ "collection": "test",
+ "batchSize": 3,
+ "lsid": "session0",
+ "txnNumber": {
+ "$numberLong": "1"
+ },
+ "stmtId": 3,
+ "startTransaction": null,
+ "autocommit": false
+ },
+ "command_name": "getMore",
+ "database_name": "transaction-tests"
+ }
+ },
+ {
+ "command_started_event": {
+ "command": {
+ "commitTransaction": 1,
+ "lsid": "session0",
+ "txnNumber": {
+ "$numberLong": "1"
+ },
+ "stmtId": 4,
+ "startTransaction": null,
+ "autocommit": false,
+ "writeConcern": null
+ },
+ "command_name": "commitTransaction",
+ "database_name": "admin"
+ }
+ }
+ ],
+ "outcome": {
+ "collection": {
+ "data": [
+ {
+ "_id": 1
+ },
+ {
+ "_id": 2
+ },
+ {
+ "_id": 3
+ },
+ {
+ "_id": 4
+ }
+ ]
+ }
+ }
+ },
  {
  "description": "distinct",
  "operations": [