Enable session.abort_transaction()

ajdavis · ajdavis · commit b41c2af3a00a · 2018-04-16T09:57:45.000-04:00
diff --git a/pymongo/client_session.py b/pymongo/client_session.py
@@ -217,15 +217,12 @@ def abort_transaction(self):
 
     def _finish_transaction(self, command_name):
         if self._current_transaction_opts is None:
-            raise InvalidOperation("No transaction in progress")
+            raise InvalidOperation("No transaction started")
 
         if self._server_session.statement_id == 0:
             # Not really started.
             return
 
-        if command_name == 'abortTransaction':
-            assert False, "Not implemented"  # Await server.
-
         try:
             # TODO: retryable. And it's weird to pass parse_write_concern_error
             # from outside database.py.
diff --git a/test/test_transactions.py b/test/test_transactions.py
@@ -234,13 +234,7 @@ def expect_error(expected_result):
 
 def end_sessions(sessions):
     for s in sessions.values():
-        try:
-            s.commit_transaction()
-        except Exception:
-            # Ignore errors from committing without an open transaction.
-            pass
-
-    for s in sessions.values():
+        # Aborts the transaction if it's open.
         s.end_session()
 
 
