fix tests

Author: rahul2393

google/cloud/spanner_v1/database.py

@@ -1578,15 +1578,20 @@ def _get_session(self):
            all partitions have been processed.
         """
         from google.cloud.spanner_v1.database import TransactionType
+        from google.cloud.spanner_v1.session import Session
 
+        
         if self._session is None:
-            session = self._session = self._database._session_manager.get_session(
-                TransactionType.READ_ONLY
-            )
+            database = self._database
+           
             if self._session_id is None:
-                session.create()
+                session = database._session_manager.get_session(TransactionType.READ_ONLY)
+                self._session_id = session.session_id
             else:
+                session = Session(database=database)
                 session._session_id = self._session_id
+
+            self._session = session
         return self._session
 
     def _get_snapshot(self):

tests/system/test_observability_options.py

@@ -16,8 +16,10 @@
 from google.auth.credentials import AnonymousCredentials
 from google.rpc import code_pb2
 import pytest
+from unittest.mock import patch, PropertyMock
 
 from google.cloud.spanner_v1 import Client
+from google.cloud.spanner_v1.session import Session
 
 from . import _helpers
 
@@ -196,9 +198,15 @@ def create_db_trace_exporter():
     not HAS_OTEL_INSTALLED,
     reason="Tracing requires OpenTelemetry",
 )
-def test_transaction_abort_then_retry_spans():
+@patch.object(Session, "session_id", new_callable=PropertyMock)
+@patch.object(Session, "is_multiplexed", new_callable=PropertyMock)
+def test_transaction_abort_then_retry_spans(mock_session_multiplexed, mock_session_id):
     from opentelemetry.trace.status import StatusCode
 
+    # Mock session properties for testing.
+    mock_session_multiplexed.return_value = session_multiplexed = False
+    mock_session_id.return_value = session_id = "session-id"
+
     db, trace_exporter = create_db_trace_exporter()
 
     counters = dict(aborted=0)
@@ -225,12 +233,14 @@ def select_in_txn(txn):
         ("Waiting for a session to become available", {"kind": "BurstyPool"}),
         ("No sessions available in pool. Creating session", {"kind": "BurstyPool"}),
         ("Creating Session", {}),
+        ("Using session", {"id": session_id, "multiplexed": session_multiplexed}),
         (
             "Transaction was aborted in user operation, retrying",
             {"delay_seconds": "EPHEMERAL", "cause": "EPHEMERAL", "attempt": 1},
         ),
         ("Starting Commit", {}),
         ("Commit Done", {}),
+        ("Returning session", {"id": session_id, "multiplexed": session_multiplexed}),
     ]
     assert got_events == want_events
 
@@ -392,9 +402,15 @@ def tx_update(txn):
     not HAS_OTEL_INSTALLED,
     reason="Tracing requires OpenTelemetry",
 )
-def test_database_partitioned_error():
+@patch.object(Session, "session_id", new_callable=PropertyMock)
+@patch.object(Session, "is_multiplexed", new_callable=PropertyMock)
+def test_database_partitioned_error(mock_session_multiplexed, mock_session_id):
     from opentelemetry.trace.status import StatusCode
 
+    # Mock session properties for testing.
+    mock_session_multiplexed.return_value = session_multiplexed = False
+    mock_session_id.return_value = session_id = "session-id"
+
     db, trace_exporter = create_db_trace_exporter()
 
     try:
@@ -409,6 +425,7 @@ def test_database_partitioned_error():
         ("Waiting for a session to become available", {"kind": "BurstyPool"}),
         ("No sessions available in pool. Creating session", {"kind": "BurstyPool"}),
         ("Creating Session", {}),
+        ("Using session", {"id": session_id, "multiplexed": session_multiplexed}),
         ("Starting BeginTransaction", {}),
         (
             "exception",
@@ -428,6 +445,7 @@ def test_database_partitioned_error():
                 "exception.escaped": "False",
             },
         ),
+        ("Returning session", {"id": session_id, "multiplexed": session_multiplexed}),
     ]
     assert got_events == want_events