Skip to content

Commit fea8788

Browse files
committed
remove aurora connection tracker from plugin list
1 parent 0b3b1c0 commit fea8788

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

.github/workflows/integration_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ jobs:
5050
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
5151

5252
- name: 'Run LTS Integration Tests'
53-
timeout-minutes: 180
53+
timeout-minutes: 120
5454
run: |
5555
./gradlew --no-parallel --no-daemon test-python-${{ matrix.python-version }}-${{ matrix.environment }} --info \
56-
> test-output.log 2>&1
56+
2>&1 | tee test-output.log
5757
env:
5858
RDS_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
5959
RDS_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}

aws_advanced_python_wrapper/plugin_service.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,9 @@ def get_plugins(self) -> List[Plugin]:
845845
if plugin_codes is None:
846846
plugin_codes = WrapperProperties.DEFAULT_PLUGINS
847847

848+
if plugin_codes.lower() == "none":
849+
plugin_codes = ""
850+
848851
if plugin_codes != "":
849852
plugin_factories = self.create_plugin_factories_from_list(plugin_codes.split(","))
850853

tests/integration/container/tortoise/test_tortoise_common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ async def clear_test_models():
3333
await attr.all().delete()
3434

3535

36-
async def setup_tortoise(conn_utils, plugins="aurora_connection_tracker", **kwargs):
36+
async def setup_tortoise(conn_utils, plugins="none", **kwargs):
3737
"""Setup Tortoise with AWS MySQL backend and configurable plugins."""
3838
db_url = conn_utils.get_aws_tortoise_url(
3939
TestEnvironment.get_current().get_engine(),

tests/integration/container/tortoise/test_tortoise_config.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ async def setup_tortoise_dict_config(self, conn_utils):
5656
"user": conn_utils.user,
5757
"password": conn_utils.password,
5858
"database": conn_utils.dbname,
59-
"plugins": "aurora_connection_tracker",
59+
"plugins": "none",
6060
}
6161
}
6262
},
@@ -94,7 +94,7 @@ async def setup_tortoise_multi_db(self, conn_utils):
9494
"user": conn_utils.user,
9595
"password": conn_utils.password,
9696
"database": original_db,
97-
"plugins": "aurora_connection_tracker",
97+
"plugins": "none",
9898
}
9999
},
100100
"second_db": {
@@ -105,7 +105,7 @@ async def setup_tortoise_multi_db(self, conn_utils):
105105
"user": conn_utils.user,
106106
"password": conn_utils.password,
107107
"database": second_db,
108-
"plugins": "aurora_connection_tracker"
108+
"plugins": "none"
109109
}
110110
}
111111
},
@@ -156,7 +156,7 @@ async def setup_tortoise_with_router(self, conn_utils):
156156
"user": conn_utils.user,
157157
"password": conn_utils.password,
158158
"database": conn_utils.dbname,
159-
"plugins": "aurora_connection_tracker"
159+
"plugins": "none"
160160
}
161161
}
162162
},

tests/integration/container/tortoise/test_tortoise_custom_endpoint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ async def setup_tortoise_custom_endpoint(self, conn_utils, create_custom_endpoin
137137
yield result
138138

139139
@pytest.mark.parametrize("setup_tortoise_custom_endpoint", [
140-
("custom_endpoint,aurora_connection_tracker", "default"),
140+
("custom_endpoint", "default"),
141141
("failover,iam,aurora_connection_tracker,custom_endpoint,fastest_response_strategy", "iam_user")
142142
], indirect=True)
143143
@pytest.mark.asyncio
@@ -146,7 +146,7 @@ async def test_basic_read_operations(self, setup_tortoise_custom_endpoint):
146146
await run_basic_read_operations("Custom Test", "custom")
147147

148148
@pytest.mark.parametrize("setup_tortoise_custom_endpoint", [
149-
("custom_endpoint,aurora_connection_tracker", "default"),
149+
("custom_endpoint", "default"),
150150
("failover,iam,aurora_connection_tracker,custom_endpoint,fastest_response_strategy", "iam_user")
151151
], indirect=True)
152152
@pytest.mark.asyncio

tests/integration/host/src/test/java/integration/TestEnvironmentFeatures.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@ public enum TestEnvironmentFeatures {
2929
RUN_AUTOSCALING_TESTS_ONLY,
3030
TELEMETRY_TRACES_ENABLED,
3131
TELEMETRY_METRICS_ENABLED,
32-
BLUE_GREEN_DEPLOYMENT
32+
BLUE_GREEN_DEPLOYMENT,
33+
RUN_ORM_TESTS,
3334
}

0 commit comments

Comments
 (0)