update test names and fix writeconcern handling

Author: blink1073

pymongo/asynchronous/mongo_client.py

@@ -2824,8 +2824,10 @@ async def run(self) -> T:
                             and self._session is not None
                             and self._session.in_transaction
                         ):
-                            if not self._session._transaction.has_completed_command:
-                                self._session._transaction.set_starting()
+                            transaction = self._session._transaction
+                            if not transaction.has_completed_command:
+                                transaction.set_starting()
+                            transaction.attempt = 0
                     else:
                         raise
 
@@ -2864,8 +2866,10 @@ async def run(self) -> T:
                     # Revert back to starting state if we're in a transaction but haven't completed the first
                     # command.
                     if overloaded and self._session is not None and self._session.in_transaction:
-                        if not self._session._transaction.has_completed_command:
-                            self._session._transaction.set_starting()
+                        transaction = self._session._transaction
+                        if not transaction.has_completed_command:
+                            transaction.set_starting()
+                        transaction.attempt = 0
 
                 if self._client.topology_description.topology_type == TOPOLOGY_TYPE.Sharded:
                     self._deprioritized_servers.append(self._server)

pymongo/synchronous/mongo_client.py

@@ -2814,8 +2814,10 @@ def run(self) -> T:
                             and self._session is not None
                             and self._session.in_transaction
                         ):
-                            if not self._session._transaction.has_completed_command:
-                                self._session._transaction.set_starting()
+                            transaction = self._session._transaction
+                            if not transaction.has_completed_command:
+                                transaction.set_starting()
+                            transaction.attempt = 0
                     else:
                         raise
 
@@ -2854,8 +2856,10 @@ def run(self) -> T:
                     # Revert back to starting state if we're in a transaction but haven't completed the first
                     # command.
                     if overloaded and self._session is not None and self._session.in_transaction:
-                        if not self._session._transaction.has_completed_command:
-                            self._session._transaction.set_starting()
+                        transaction = self._session._transaction
+                        if not transaction.has_completed_command:
+                            transaction.set_starting()
+                        transaction.attempt = 0
 
                 if self._client.topology_description.topology_type == TOPOLOGY_TYPE.Sharded:
                     self._deprioritized_servers.append(self._server)

test/transactions/unified/backpressure-retryable-abort.json

@@ -1,5 +1,5 @@
 {
-  "description": "retryable-abort",
+  "description": "backpressure-retryable-abort",
   "schemaVersion": "1.3",
   "runOnRequirements": [
     {

test/transactions/unified/backpressure-retryable-commit.json

@@ -1,5 +1,5 @@
 {
-  "description": "retryable-commit",
+  "description": "backpressure-retryable-commit",
   "schemaVersion": "1.4",
   "runOnRequirements": [
     {
@@ -177,8 +177,7 @@
                   },
                   "autocommit": false,
                   "writeConcern": {
-                    "w": "majority",
-                    "wtimeout": 10000
+                    "$$exists": false
                   }
                 },
                 "commandName": "commitTransaction",
@@ -200,8 +199,7 @@
                   },
                   "autocommit": false,
                   "writeConcern": {
-                    "w": "majority",
-                    "wtimeout": 10000
+                    "$$exists": false
                   }
                 },
                 "commandName": "commitTransaction",