diff --git a/packages/google-cloud-spanner/tests/system/test_session_api.py b/packages/google-cloud-spanner/tests/system/test_session_api.py index b916f3cc5283..c84835810cfd 100644 --- a/packages/google-cloud-spanner/tests/system/test_session_api.py +++ b/packages/google-cloud-spanner/tests/system/test_session_api.py @@ -263,45 +263,20 @@ @pytest.fixture(scope="session") -def sessions_database( - shared_instance, database_operation_timeout, database_dialect, proto_descriptor_file -): - database_name = _helpers.unique_id("test_sessions", separator="_") +def sessions_database(shared_instance, shared_database): pool = spanner_v1.BurstyPool(labels={"testcase": "session_api"}) - - if database_dialect == DatabaseDialect.POSTGRESQL: - sessions_database = shared_instance.database( - database_name, - pool=pool, - database_dialect=database_dialect, - ) - - operation = sessions_database.create() - operation.result(database_operation_timeout) - - operation = sessions_database.update_ddl(ddl_statements=_helpers.DDL_STATEMENTS) - operation.result(database_operation_timeout) - - else: - sessions_database = shared_instance.database( - database_name, - ddl_statements=_helpers.DDL_STATEMENTS, - pool=pool, - proto_descriptors=proto_descriptor_file, - ) - - operation = sessions_database.create() - operation.result(database_operation_timeout) - - _helpers.retry_has_all_dll(sessions_database.reload)() + database = shared_instance.database( + shared_database.database_id, + pool=pool, + database_dialect=shared_database.database_dialect, + proto_descriptors=getattr(shared_database, "_proto_descriptors", None), + ) # Some tests expect there to be a session present in the pool. # Experimental host connections only support multiplexed sessions if not _helpers.USE_SPANNER_OMNI: pool.put(pool.get()) - yield sessions_database - - sessions_database.drop() + return database @pytest.fixture(scope="function")