Skip to content

Commit 1809d2e

Browse files
committed
integ test debug
1 parent e629cc8 commit 1809d2e

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

tests/integration/container/tortoise/test_tortoise_config.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
from tests.integration.container.tortoise.test_tortoise_common import \
2323
reset_tortoise
2424
from tests.integration.container.utils.conditions import (disable_on_engines,
25-
disable_on_features)
25+
disable_on_features,
26+
disable_on_deployments)
2627
from tests.integration.container.utils.database_engine import DatabaseEngine
28+
from tests.integration.container.utils.database_engine_deployment import DatabaseEngineDeployment
2729
from tests.integration.container.utils.test_environment_features import \
2830
TestEnvironmentFeatures
2931

@@ -43,17 +45,18 @@ async def _clear_all_test_models(self):
4345
async def setup_tortoise_dict_config(self, conn_utils):
4446
"""Setup Tortoise with dictionary configuration instead of URL."""
4547
# Ensure clean state
48+
host = conn_utils.writer_cluster_host if conn_utils.writer_cluster_host else conn_utils.writer_host
4649
config = {
4750
"connections": {
4851
"default": {
4952
"engine": "aws_advanced_python_wrapper.tortoise_orm.backends.mysql",
5053
"credentials": {
51-
"host": conn_utils.writer_cluster_host,
54+
"host": host,
5255
"port": conn_utils.port,
5356
"user": conn_utils.user,
5457
"password": conn_utils.password,
5558
"database": conn_utils.dbname,
56-
"plugins": "aurora_connection_tracker,failover",
59+
"plugins": "aurora_connection_tracker",
5760
}
5861
}
5962
},
@@ -80,29 +83,29 @@ async def setup_tortoise_multi_db(self, conn_utils):
8083
# Create second database name
8184
original_db = conn_utils.dbname
8285
second_db = f"{original_db}_test2"
83-
86+
host = conn_utils.writer_cluster_host if conn_utils.writer_cluster_host else conn_utils.writer_host
8487
config = {
8588
"connections": {
8689
"default": {
8790
"engine": "aws_advanced_python_wrapper.tortoise_orm.backends.mysql",
8891
"credentials": {
89-
"host": conn_utils.writer_cluster_host,
92+
"host": host,
9093
"port": conn_utils.port,
9194
"user": conn_utils.user,
9295
"password": conn_utils.password,
9396
"database": original_db,
94-
"plugins": "aurora_connection_tracker,failover",
97+
"plugins": "aurora_connection_tracker",
9598
}
9699
},
97100
"second_db": {
98101
"engine": "aws_advanced_python_wrapper.tortoise_orm.backends.mysql",
99102
"credentials": {
100-
"host": conn_utils.writer_cluster_host,
103+
"host": host,
101104
"port": conn_utils.port,
102105
"user": conn_utils.user,
103106
"password": conn_utils.password,
104107
"database": second_db,
105-
"plugins": "aurora_connection_tracker,failover"
108+
"plugins": "aurora_connection_tracker"
106109
}
107110
}
108111
},
@@ -142,17 +145,18 @@ async def setup_tortoise_multi_db(self, conn_utils):
142145
@pytest_asyncio.fixture
143146
async def setup_tortoise_with_router(self, conn_utils):
144147
"""Setup Tortoise with router configuration."""
148+
host = conn_utils.writer_cluster_host if conn_utils.writer_cluster_host else conn_utils.writer_host
145149
config = {
146150
"connections": {
147151
"default": {
148152
"engine": "aws_advanced_python_wrapper.tortoise_orm.backends.mysql",
149153
"credentials": {
150-
"host": conn_utils.writer_cluster_host,
154+
"host": host,
151155
"port": conn_utils.port,
152156
"user": conn_utils.user,
153157
"password": conn_utils.password,
154158
"database": conn_utils.dbname,
155-
"plugins": "aurora_connection_tracker,failover"
159+
"plugins": "aurora_connection_tracker"
156160
}
157161
}
158162
},
@@ -210,6 +214,7 @@ async def test_dict_config_write_operations(self, setup_tortoise_dict_config):
210214
with pytest.raises(Exception):
211215
await User.get(id=user.id)
212216

217+
@disable_on_deployments([DatabaseEngineDeployment.DOCKER])
213218
@pytest.mark.asyncio
214219
async def test_multi_db_operations(self, setup_tortoise_multi_db):
215220
"""Test operations with multiple databases using same backend."""

tests/integration/container/utils/conditions.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,11 @@ def disable_on_features(disable_on_test_features: List[TestEnvironmentFeatures])
8787
disable_test,
8888
reason="The current test environment contains test features for which this test is disabled"
8989
)
90+
91+
92+
def disable_on_deployments(requested_deployments: List[DatabaseEngineDeployment]):
93+
current_deployment = TestEnvironment.get_current().get_deployment()
94+
return pytest.mark.skipif(
95+
current_deployment in requested_deployments,
96+
reason=f"This test is not supported for {current_deployment.value} deployments"
97+
)

tests/integration/container/utils/connection_utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ def get_aws_tortoise_url(
109109
dbname: Optional[str] = None,
110110
**kwargs) -> str:
111111
"""Build AWS MySQL connection URL for Tortoise ORM with query parameters."""
112-
113112
env_host = self.writer_cluster_host if self.writer_cluster_host else self.writer_host
114113
host = env_host if host is None else host
115114
port = self.port if port is None else port

0 commit comments

Comments
 (0)