Add errorCodeName assertion to transaction tests

Author: ShaneHarvey

test/test_transactions.py

@@ -20,7 +20,7 @@
 import sys
 
 from bson import json_util, py3compat
-from pymongo.errors import PyMongoError
+from pymongo.errors import OperationFailure, PyMongoError
 from pymongo.read_concern import ReadConcern
 from pymongo.read_preferences import (make_read_preference,
  read_pref_mode_from_name)
@@ -236,13 +236,20 @@ def check_events(self, test, listener, session_ids):
  self.assertEqual(actual, expected)
 
 
-def expect_error(expected_result):
+def expect_error_message(expected_result):
  if isinstance(expected_result, dict):
  return expected_result['errorContains']
 
  return False
 
 
+def expect_error_code(expected_result):
+ if isinstance(expected_result, dict):
+ return expected_result['errorCodeName']
+
+ return False
+
+
 def end_sessions(sessions):
  for s in sessions.values():
  # Aborts the transaction if it's open.
@@ -285,13 +292,18 @@ def run_scenario(self):
 
  for op in test['operations']:
  expected_result = op.get('result')
- if expect_error(expected_result):
+ if expect_error_message(expected_result):
  with self.assertRaises(PyMongoError) as context:
  self.run_operation(sessions, collection, op.copy())
 
  self.assertIn(expected_result['errorContains'].lower(),
  str(context.exception).lower())
+ elif expect_error_code(expected_result):
+ with self.assertRaises(OperationFailure) as context:
+ self.run_operation(sessions, collection, op.copy())
 
+ self.assertEqual(expected_result['errorCodeName'],
+ context.exception.details.get('codeName'))
  else:
  result = self.run_operation(sessions, collection, op.copy())
  if 'result' in op:

test/transactions/abort.json

@@ -72,6 +72,7 @@
  "$numberLong": "1"
  },
  "stmtId": 0,
+ "startTransaction": true,
  "autocommit": false,
  "writeConcern": null
  },
@@ -115,6 +116,7 @@
  "$numberLong": "2"
  },
  "stmtId": 0,
+ "startTransaction": true,
  "autocommit": false,
  "writeConcern": null
  },
@@ -187,6 +189,7 @@
  "$numberLong": "1"
  },
  "stmtId": 0,
+ "startTransaction": true,
  "autocommit": false,
  "writeConcern": null
  },
@@ -439,7 +442,19 @@
  "session": "session0"
  },
  "result": {
- "errorContains": "duplicate key error"
+ "errorCodeName": "DuplicateKey"
+ }
+ },
+ {
+ "name": "insertOne",
+ "arguments": {
+ "document": {
+ "_id": 1
+ },
+ "session": "session0"
+ },
+ "result": {
+ "errorCodeName": "NoSuchTransaction"
  }
  },
  {
@@ -503,7 +518,14 @@
  {
  "command_started_event": {
  "command": {
- "abortTransaction": 1,
+ "insert": "test",
+ "documents": [
+ {
+ "_id": 1
+ }
+ ],
+ "ordered": true,
+ "readConcern": null,
  "lsid": "session0",
  "txnNumber": {
  "$numberLong": "1"
@@ -513,6 +535,23 @@
  "autocommit": false,
  "writeConcern": null
  },
+ "command_name": "insert",
+ "database_name": "transaction-tests"
+ }
+ },
+ {
+ "command_started_event": {
+ "command": {
+ "abortTransaction": 1,
+ "lsid": "session0",
+ "txnNumber": {
+ "$numberLong": "1"
+ },
+ "stmtId": 3,
+ "startTransaction": null,
+ "autocommit": false,
+ "writeConcern": null
+ },
  "command_name": "abortTransaction",
  "database_name": "admin"
  }

test/transactions/bulk.json

@@ -160,6 +160,21 @@
  }
  }
  }
+ },
+ {
+ "name": "updateMany",
+ "arguments": {
+ "filter": {
+ "_id": {
+ "$gte": 2
+ }
+ },
+ "update": {
+ "$set": {
+ "z": 1
+ }
+ }
+ }
  }
  ],
  "session": "session0"
@@ -174,8 +189,8 @@
  "6": 6,
  "7": 7
  },
- "matchedCount": 3,
- "modifiedCount": 3,
+ "matchedCount": 5,
+ "modifiedCount": 5,
  "upsertedCount": 1,
  "upsertedIds": {
  "2": 2
@@ -427,7 +442,24 @@
  {
  "command_started_event": {
  "command": {
- "commitTransaction": 1,
+ "update": "test",
+ "updates": [
+ {
+ "q": {
+ "_id": {
+ "$gte": 2
+ }
+ },
+ "u": {
+ "$set": {
+ "z": 1
+ }
+ },
+ "multi": true,
+ "upsert": false
+ }
+ ],
+ "ordered": true,
  "lsid": "session0",
  "txnNumber": {
  "$numberLong": "1"
@@ -437,6 +469,23 @@
  "autocommit": false,
  "writeConcern": null
  },
+ "command_name": "update",
+ "database_name": "transaction-tests"
+ }
+ },
+ {
+ "command_started_event": {
+ "command": {
+ "commitTransaction": 1,
+ "lsid": "session0",
+ "txnNumber": {
+ "$numberLong": "1"
+ },
+ "stmtId": 16,
+ "startTransaction": null,
+ "autocommit": false,
+ "writeConcern": null
+ },
  "command_name": "commitTransaction",
  "database_name": "admin"
  }
@@ -451,10 +500,12 @@
  },
  {
  "_id": 2,
- "y": 2
+ "y": 2,
+ "z": 1
  },
  {
- "_id": 5
+ "_id": 5,
+ "z": 1
  }
  ]
  }

test/transactions/causal-consistency.json

@@ -208,7 +208,7 @@
  "session": "session0"
  },
  "result": {
- "errorContains": "WriteConflict"
+ "errorCodeName": "WriteConflict"
  }
  },
  {

test/transactions/reads.json

@@ -209,6 +209,7 @@
  "command_started_event": {
  "command": {
  "find": "test",
+ "batchSize": 3,
  "readConcern": {
  "level": "snapshot"
  },
@@ -230,6 +231,8 @@
  "getMore": {
  "$numberLong": "42"
  },
+ "collection": "test",
+ "batchSize": 3,
  "lsid": "session0",
  "txnNumber": {
  "$numberLong": "1"
@@ -246,6 +249,7 @@
  "command_started_event": {
  "command": {
  "find": "test",
+ "batchSize": 3,
  "lsid": "session0",
  "txnNumber": {
  "$numberLong": "1"
@@ -264,6 +268,8 @@
  "getMore": {
  "$numberLong": "42"
  },
+ "collection": "test",
+ "batchSize": 3,
  "lsid": "session0",
  "txnNumber": {
  "$numberLong": "1"
@@ -347,6 +353,7 @@
  "command_started_event": {
  "command": {
  "distinct": "test",
+ "key": "_id",
  "lsid": "session0",
  "readConcern": {
  "level": "snapshot"

test/transactions/update.json

@@ -58,6 +58,27 @@
  "upsertedCount": 0
  }
  },
+ {
+ "name": "updateMany",
+ "arguments": {
+ "filter": {
+ "_id": {
+ "$gte": 3
+ }
+ },
+ "update": {
+ "$set": {
+ "z": 1
+ }
+ },
+ "session": "session0"
+ },
+ "result": {
+ "matchedCount": 2,
+ "modifiedCount": 2,
+ "upsertedCount": 0
+ }
+ },
  {
  "name": "commitTransaction",
  "arguments": {
@@ -134,7 +155,24 @@
  {
  "command_started_event": {
  "command": {
- "commitTransaction": 1,
+ "update": "test",
+ "updates": [
+ {
+ "q": {
+ "_id": {
+ "$gte": 3
+ }
+ },
+ "u": {
+ "$set": {
+ "z": 1
+ }
+ },
+ "multi": true,
+ "upsert": false
+ }
+ ],
+ "ordered": true,
  "lsid": "session0",
  "txnNumber": {
  "$numberLong": "1"
@@ -144,6 +182,23 @@
  "autocommit": false,
  "writeConcern": null
  },
+ "command_name": "update",
+ "database_name": "transaction-tests"
+ }
+ },
+ {
+ "command_started_event": {
+ "command": {
+ "commitTransaction": 1,
+ "lsid": "session0",
+ "txnNumber": {
+ "$numberLong": "1"
+ },
+ "stmtId": 3,
+ "startTransaction": null,
+ "autocommit": false,
+ "writeConcern": null
+ },
  "command_name": "commitTransaction",
  "database_name": "admin"
  }
@@ -159,11 +214,13 @@
  "_id": 2
  },
  {
- "_id": 3
+ "_id": 3,
+ "z": 1
  },
  {
  "_id": 4,
- "y": 1
+ "y": 1,
+ "z": 1
  }
  ]
  }