PYTHON-1508 Remove autoStartTransaction and resync tests

Also use the test file's database name and collection name.

Author: ShaneHarvey

pymongo/client_session.py

@@ -105,17 +105,13 @@ class SessionOptions(object):
     :Parameters:
       - `causal_consistency` (optional): If True (the default), read
         operations are causally ordered within the session.
-      - `auto_start_transaction` (optional): If True, any operation using
-        the session automatically starts a transaction.
       - `default_transaction_options` (optional): The default
         TransactionOptions to use for transactions started on this session.
     """
     def __init__(self,
                  causal_consistency=True,
-                 auto_start_transaction=False,
                  default_transaction_options=None):
         self._causal_consistency = causal_consistency
-        self._auto_start_transaction = auto_start_transaction
         if default_transaction_options is not None:
             if not isinstance(default_transaction_options, TransactionOptions):
                 raise TypeError(
@@ -129,15 +125,6 @@ def causal_consistency(self):
         """Whether causal consistency is configured."""
         return self._causal_consistency
 
-    @property
-    def auto_start_transaction(self):
-        """Whether any operation using the session automatically starts a
-        transaction.
-
-        .. versionadded:: 3.7
-        """
-        return self._auto_start_transaction
-
     @property
     def default_transaction_options(self):
         """The default TransactionOptions to use for transactions started on
@@ -349,7 +336,7 @@ def abort_transaction(self):
     def _finish_transaction(self, command_name):
         self._check_ended()
 
-        if not self._in_transaction_or_auto_start():
+        if not self._in_transaction:
             raise InvalidOperation("No transaction started")
 
         try:
@@ -424,24 +411,14 @@ def _in_transaction(self):
         """True if this session has an active multi-statement transaction."""
         return self._transaction is not None
 
-    def _in_transaction_or_auto_start(self):
-        """True if this session has an active transaction or will have one."""
-        if self._in_transaction:
-            return True
-        if self.options.auto_start_transaction:
-            self.start_transaction()
-            return True
-        return False
-
     def _txn_read_preference(self):
         """Return read preference of this transaction or None."""
-        if self._in_transaction_or_auto_start():
+        if self._in_transaction:
             return self._transaction.opts.read_preference
         return None
 
     def _apply_to(self, command, is_retryable, read_preference):
         self._check_ended()
-        self._in_transaction_or_auto_start()
 
         self._server_session.last_use = monotonic.time()
         command['lsid'] = self._server_session.session_id

pymongo/mongo_client.py

@@ -1070,8 +1070,7 @@ def _retry_with_session(self, retryable, func, session, bulk):
         Re-raises any exception thrown by func().
         """
         retryable = (retryable and self.retry_writes
-                     and session
-                     and not session._in_transaction_or_auto_start())
+                     and session and not session._in_transaction)
         last_error = None
         retrying = False
 
@@ -1361,7 +1360,6 @@ def _process_periodic_tasks(self):
 
     def start_session(self,
                       causal_consistency=True,
-                      auto_start_transaction=False,
                       default_transaction_options=None):
         """Start a logical session.
 
@@ -1393,7 +1391,6 @@ def start_session(self,
         server_session = self._get_server_session()
         opts = client_session.SessionOptions(
             causal_consistency=causal_consistency,
-            auto_start_transaction=auto_start_transaction,
             default_transaction_options=default_transaction_options)
         return client_session.ClientSession(
             self, server_session, opts, authset)

test/test_transactions.py

@@ -299,14 +299,16 @@ def run_scenario(self):
             # "operation was interrupted" by killing the command's own session.
             pass
 
+        database_name = scenario_def['database_name']
+        collection_name = scenario_def['collection_name']
         write_concern_db = client.get_database(
-            'transaction-tests', write_concern=WriteConcern(w='majority'))
-
-        write_concern_db.test.drop()
-        write_concern_db.create_collection('test')
+            database_name, write_concern=WriteConcern(w='majority'))
+        write_concern_coll = write_concern_db[collection_name]
+        write_concern_coll.drop()
+        write_concern_db.create_collection(collection_name)
         if scenario_def['data']:
             # Load data.
-            write_concern_db.test.insert_many(scenario_def['data'])
+            write_concern_coll.insert_many(scenario_def['data'])
 
         # Create session0 and session1.
         sessions = {}
@@ -349,7 +351,7 @@ def run_scenario(self):
         self.addCleanup(end_sessions, sessions)
 
         listener.results.clear()
-        collection = client['transaction-tests'].test
+        collection = client[database_name][collection_name]
 
         for op in test['operations']:
             expected_result = op.get('result')

test/transactions/abort.json

@@ -1,4 +1,6 @@
 {
+  "database_name": "transaction-tests",
+  "collection_name": "test",
   "data": [],
   "tests": [
     {