Skip to content
This repository was archived by the owner on Mar 31, 2026. It is now read-only.

Commit eb5595b

Browse files
committed
fix: resolve subsequent test failures from refactoring
- Fix missing imports in metrics_exporter.py - Fix shadow datetime import in test_pool.py - Fix exception handling in cursor.py that broke dbapi tests
1 parent e625c96 commit eb5595b

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

google/cloud/spanner_dbapi/cursor.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -505,14 +505,16 @@ def _fetch(self, cursor_statement_type, size=None):
505505
raise
506506
else:
507507
self.transaction_helper.retry_transaction()
508+
except Aborted as e:
509+
exception = e
508510
except Exception as e:
509511
exception = e
510-
raise
511-
finally:
512-
if not self._in_retry_mode:
513-
self.transaction_helper.add_fetch_statement_for_retry(
514-
self, rows, exception, is_fetch_all
515-
)
512+
513+
if not self._in_retry_mode:
514+
self.transaction_helper.add_fetch_statement_for_retry(
515+
self, rows, exception, is_fetch_all
516+
)
517+
516518
return rows
517519

518520
def _handle_DQL_with_snapshot(self, snapshot, sql, params):

google/cloud/spanner_v1/metrics/metrics_exporter.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
MONITORED_RESOURCE_LABELS,
2121
METRIC_LABELS,
2222
METRIC_NAMES,
23+
MONITORED_RES_LABEL_KEY_PROJECT,
24+
MONITORED_RES_LABEL_KEY_INSTANCE,
2325
)
2426

2527
import logging

tests/unit/test_pool.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ def test_get_hit_no_ping(self, mock_region):
945945
return_value="global",
946946
)
947947
def test_get_hit_w_ping(self, mock_region):
948-
import datetime
948+
949949
from google.cloud._testing import _Monkey
950950
from google.cloud.spanner_v1 import pool as MUT
951951

@@ -973,7 +973,7 @@ def test_get_hit_w_ping(self, mock_region):
973973
return_value="global",
974974
)
975975
def test_get_hit_w_ping_expired(self, mock_region):
976-
import datetime
976+
977977
from google.cloud._testing import _Monkey
978978
from google.cloud.spanner_v1 import pool as MUT
979979

@@ -1096,7 +1096,7 @@ def test_spans_put_full(self, mock_region):
10961096
return_value="global",
10971097
)
10981098
def test_put_non_full(self, mock_region):
1099-
import datetime
1099+
11001100
from google.cloud._testing import _Monkey
11011101
from google.cloud.spanner_v1 import pool as MUT
11021102

@@ -1171,7 +1171,7 @@ def test_ping_oldest_fresh(self, mock_region):
11711171
return_value="global",
11721172
)
11731173
def test_ping_oldest_stale_but_exists(self, mock_region):
1174-
import datetime
1174+
11751175
from google.cloud._testing import _Monkey
11761176
from google.cloud.spanner_v1 import pool as MUT
11771177

@@ -1192,7 +1192,7 @@ def test_ping_oldest_stale_but_exists(self, mock_region):
11921192
return_value="global",
11931193
)
11941194
def test_ping_oldest_stale_and_not_exists(self, mock_region):
1195-
import datetime
1195+
11961196
from google.cloud._testing import _Monkey
11971197
from google.cloud.spanner_v1 import pool as MUT
11981198

0 commit comments

Comments
 (0)