diff --git a/source/transactions-convenient-api/tests/callback-retry.json b/source/transactions-convenient-api/tests/callback-retry.json index 2275441d68..147ce858b3 100644 --- a/source/transactions-convenient-api/tests/callback-retry.json +++ b/source/transactions-convenient-api/tests/callback-retry.json @@ -207,7 +207,6 @@ } }, "result": { - "errorCodeName": "DuplicateKey", "errorLabelsOmit": [ "TransientTransactionError", "UnknownTransactionCommitResult" @@ -218,7 +217,6 @@ } }, "result": { - "errorCodeName": "DuplicateKey", "errorLabelsOmit": [ "TransientTransactionError", "UnknownTransactionCommitResult" diff --git a/source/transactions-convenient-api/tests/callback-retry.yml b/source/transactions-convenient-api/tests/callback-retry.yml index 1291dabf46..a71898460e 100644 --- a/source/transactions-convenient-api/tests/callback-retry.yml +++ b/source/transactions-convenient-api/tests/callback-retry.yml @@ -149,10 +149,11 @@ tests: session: session0 document: { _id: 1 } result: - errorCodeName: DuplicateKey errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"] result: - errorCodeName: DuplicateKey + # Don't assert on errorCodeName because (after SERVER-38583) the + # DuplicateKey is reported in writeErrors, not as a top-level + # command error. errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"] expectations: - diff --git a/source/transactions/tests/abort.json b/source/transactions/tests/abort.json index 084429b7a9..87e64176f4 100644 --- a/source/transactions/tests/abort.json +++ b/source/transactions/tests/abort.json @@ -441,7 +441,6 @@ } }, "result": { - "errorCodeName": "DuplicateKey", "errorLabelsOmit": [ "TransientTransactionError", "UnknownTransactionCommitResult" diff --git a/source/transactions/tests/abort.yml b/source/transactions/tests/abort.yml index f1bbca7630..e18a3ef178 100644 --- a/source/transactions/tests/abort.yml +++ b/source/transactions/tests/abort.yml @@ -297,7 +297,9 @@ tests: document: _id: 1 result: - errorCodeName: DuplicateKey + # Don't assert on errorCodeName because (after SERVER-38583) the + # DuplicateKey is reported in writeErrors, not as a top-level + # command error. errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"] # Make sure the server aborted the transaction. - name: insertOne diff --git a/source/transactions/tests/error-labels.json b/source/transactions/tests/error-labels.json index d0728b7087..40d014ddbb 100644 --- a/source/transactions/tests/error-labels.json +++ b/source/transactions/tests/error-labels.json @@ -25,7 +25,6 @@ ] }, "result": { - "errorCodeName": "DuplicateKey", "errorLabelsOmit": [ "TransientTransactionError", "UnknownTransactionCommitResult" diff --git a/source/transactions/tests/error-labels.yml b/source/transactions/tests/error-labels.yml index 04aff42c31..cd579de00d 100644 --- a/source/transactions/tests/error-labels.yml +++ b/source/transactions/tests/error-labels.yml @@ -17,7 +17,9 @@ tests: - _id: 1 - _id: 1 result: - errorCodeName: DuplicateKey + # Don't assert on errorCodeName because (after SERVER-38583) the + # DuplicateKey is reported in writeErrors, not as a top-level + # command error. errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"] - name: abortTransaction object: session0