Skip to content

test(spanner): disable pooling in mock server tests #16655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chalmerlowe wants to merge 1 commit into from
Closed

test(spanner): disable pooling in mock server tests #16655

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions packages/sqlalchemy-spanner/tests/mockserver_tests/mock_server_test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,26 @@
# limitations under the License.
import logging

from google.cloud.spanner_dbapi.parsed_statement import AutocommitDmlMode
from sqlalchemy import Engine, create_engine
from sqlalchemy.testing.plugin.plugin_base import fixtures
import google.cloud.spanner_v1.types.type as spanner_type
import google.cloud.spanner_v1.types.result_set as result_set
import google.cloud.spanner_v1.types.type as spanner_type
import grpc
from google.api_core.client_options import ClientOptions
from google.auth.credentials import AnonymousCredentials
from google.cloud.spanner_dbapi.parsed_statement import AutocommitDmlMode
from google.cloud.spanner_v1 import (
Client,
ResultSet,
TypeCode,
)
from google.cloud.spanner_v1.database import Database
from google.cloud.spanner_v1.instance import Instance
import grpc
from sqlalchemy import Engine, create_engine
from sqlalchemy.testing.plugin.plugin_base import fixtures
Comment on lines 16 to +30
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The import block is disorganized and does not follow PEP 8 alphabetical sorting. Additionally, NullPool should be imported at the top level rather than locally within a method to improve readability and maintainability.

Suggested change
import google.cloud.spanner_v1.types.result_set as result_set
import google.cloud.spanner_v1.types.type as spanner_type
import grpc
from google.api_core.client_options import ClientOptions
from google.auth.credentials import AnonymousCredentials
from google.cloud.spanner_dbapi.parsed_statement import AutocommitDmlMode
from google.cloud.spanner_v1 import (
Client,
ResultSet,
TypeCode,
)
from google.cloud.spanner_v1.database import Database
from google.cloud.spanner_v1.instance import Instance
import grpc
from sqlalchemy import Engine, create_engine
from sqlalchemy.testing.plugin.plugin_base import fixtures
from google.api_core.client_options import ClientOptions
from google.auth.credentials import AnonymousCredentials
from google.cloud.spanner_dbapi.parsed_statement import AutocommitDmlMode
from google.cloud.spanner_v1 import (
Client,
ResultSet,
TypeCode,
)
from google.cloud.spanner_v1.database import Database
from google.cloud.spanner_v1.instance import Instance
import google.cloud.spanner_v1.types.result_set as result_set
import google.cloud.spanner_v1.types.type as spanner_type
import grpc
from sqlalchemy import Engine, NullPool, create_engine
from sqlalchemy.testing.plugin.plugin_base import fixtures


from tests.mockserver_tests.mock_database_admin import DatabaseAdminServicer

# TODO: Replace this with the mock server in the Spanner client lib
from tests.mockserver_tests.mock_spanner import SpannerServicer, start_mock_server
from tests.mockserver_tests.mock_database_admin import DatabaseAdminServicer


def add_result(sql: str, result: ResultSet):
Expand Down Expand Up @@ -161,9 +162,11 @@ def teardown_method(self):
MockServerTestBase.database_admin_service.clear_requests()

def create_engine(self) -> Engine:
from sqlalchemy.pool import NullPool
return create_engine(
Comment on lines +165 to 166
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Remove the local import of NullPool as it has been moved to the top-level imports.

        return create_engine(

"spanner:///projects/p/instances/i/databases/d",
connect_args={"client": self.client, "logger": MockServerTestBase.logger},
poolclass=NullPool, # Disable pooling to force new sessions for every test
)

@property
Expand Down