Skip to content

Commit 2c80c1b

Browse files
committed
fix tests
1 parent ced5d4b commit 2c80c1b

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

tests/unit/test_database.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,9 +1260,9 @@ def _execute_partitioned_dml_helper(
12601260

12611261
multiplexed_partitioned_enabled = (
12621262
os.environ.get(
1263-
"GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS", "false"
1263+
"GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS", "true"
12641264
).lower()
1265-
== "true"
1265+
!= "false"
12661266
)
12671267

12681268
if multiplexed_partitioned_enabled:

tests/unit/test_database_session_manager.py

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -231,29 +231,29 @@ def test__use_multiplexed_read_only(self):
231231
def test__use_multiplexed_partitioned(self):
232232
transaction_type = TransactionType.PARTITIONED
233233

234-
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED] = "false"
235-
self.assertFalse(DatabaseSessionsManager._use_multiplexed(transaction_type))
236-
237-
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED] = "true"
238234
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED_PARTITIONED] = "false"
239235
self.assertFalse(DatabaseSessionsManager._use_multiplexed(transaction_type))
240236

241237
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED_PARTITIONED] = "true"
242238
self.assertTrue(DatabaseSessionsManager._use_multiplexed(transaction_type))
243239

240+
# Test default behavior (should be enabled)
241+
del environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED_PARTITIONED]
242+
self.assertTrue(DatabaseSessionsManager._use_multiplexed(transaction_type))
243+
244244
def test__use_multiplexed_read_write(self):
245245
transaction_type = TransactionType.READ_WRITE
246246

247-
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED] = "false"
248-
self.assertFalse(DatabaseSessionsManager._use_multiplexed(transaction_type))
249-
250-
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED] = "true"
251247
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED_READ_WRITE] = "false"
252248
self.assertFalse(DatabaseSessionsManager._use_multiplexed(transaction_type))
253249

254250
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED_READ_WRITE] = "true"
255251
self.assertTrue(DatabaseSessionsManager._use_multiplexed(transaction_type))
256252

253+
# Test default behavior (should be enabled)
254+
del environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED_READ_WRITE]
255+
self.assertTrue(DatabaseSessionsManager._use_multiplexed(transaction_type))
256+
257257
def test__use_multiplexed_unsupported_transaction_type(self):
258258
unsupported_type = "UNSUPPORTED_TRANSACTION_TYPE"
259259

@@ -268,15 +268,23 @@ def test__getenv(self):
268268
DatabaseSessionsManager._use_multiplexed(TransactionType.READ_ONLY)
269269
)
270270

271-
false_values = ["", "0", "false", "False", "FALSE", " false "]
271+
false_values = ["false", "False", "FALSE", " false "]
272272
for value in false_values:
273273
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED] = value
274274
self.assertFalse(
275275
DatabaseSessionsManager._use_multiplexed(TransactionType.READ_ONLY)
276276
)
277277

278+
# Test that empty string and "0" are now treated as true (default enabled)
279+
default_true_values = ["", "0", "anything", "random"]
280+
for value in default_true_values:
281+
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED] = value
282+
self.assertTrue(
283+
DatabaseSessionsManager._use_multiplexed(TransactionType.READ_ONLY)
284+
)
285+
278286
del environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED]
279-
self.assertFalse(
287+
self.assertTrue(
280288
DatabaseSessionsManager._use_multiplexed(TransactionType.READ_ONLY)
281289
)
282290

@@ -301,6 +309,8 @@ def _disable_multiplexed_sessions() -> None:
301309
"""Sets environment variables to disable multiplexed sessions for all transactions types."""
302310

303311
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED] = "false"
312+
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED_PARTITIONED] = "false"
313+
environ[DatabaseSessionsManager._ENV_VAR_MULTIPLEXED_READ_WRITE] = "false"
304314

305315
@staticmethod
306316
def _enable_multiplexed_sessions() -> None:

0 commit comments

Comments
 (0)