Skip to content

Commit 46b8d52

Browse files
committed
test: add timeouts to prevent integration tests from hanging
1 parent fb2ab01 commit 46b8d52

File tree

4 files changed

+25
-7
lines changed

4 files changed

+25
-7
lines changed

tests/integration/container/test_aurora_failover.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,15 @@ def aurora_utility(self):
5656

5757
@pytest.fixture(scope='class')
5858
def props(self):
59-
p: Properties = Properties({"plugins": "failover", "connect_timeout": 60, "topology_refresh_ms": 10, "autocommit": True})
59+
p: Properties = Properties({
60+
"plugins": "failover",
61+
"socket_timeout": 30,
62+
"connect_timeout": 10,
63+
"monitoring-connect_timeout": 5,
64+
"monitoring-socket_timeout": 5,
65+
"topology_refresh_ms": 10,
66+
"autocommit": True
67+
})
6068

6169
features = TestEnvironment.get_current().get_features()
6270
if TestEnvironmentFeatures.TELEMETRY_TRACES_ENABLED in features \

tests/integration/container/test_basic_connectivity.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,15 @@ def test_proxied_wrapper_connection_failed(
131131
@enable_on_deployments([DatabaseEngineDeployment.AURORA, DatabaseEngineDeployment.RDS_MULTI_AZ_CLUSTER])
132132
@enable_on_features([TestEnvironmentFeatures.ABORT_CONNECTION_SUPPORTED])
133133
def test_wrapper_connection_reader_cluster_with_efm_enabled(self, test_driver: TestDriver, conn_utils, plugins):
134+
props: Properties = Properties({
135+
WrapperProperties.PLUGINS.name: plugins,
136+
"socket_timeout": 5,
137+
"connect_timeout": 5,
138+
"monitoring-connect_timeout": 3,
139+
"monitoring-socket_timeout": 3,
140+
"autocommit": True})
134141
target_driver_connect = DriverHelper.get_connect_func(test_driver)
135-
conn = AwsWrapperConnection.connect(
136-
target_driver_connect,
137-
**conn_utils.get_connect_params(conn_utils.reader_cluster_host),
138-
plugins=plugins, connect_timeout=10)
142+
conn = AwsWrapperConnection.connect(target_driver_connect, **conn_utils.get_connect_params(conn_utils.reader_cluster_host), **props)
139143
cursor = conn.cursor()
140144
cursor.execute("SELECT 1")
141145
result = cursor.fetchone()

tests/integration/container/test_host_monitoring_v2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from aws_advanced_python_wrapper.utils.properties import (Properties,
2323
WrapperProperties)
2424
from tests.integration.container.utils.conditions import (
25-
disable_on_features, enable_on_deployments, disable_on_engines)
25+
disable_on_engines, disable_on_features, enable_on_deployments)
2626
from tests.integration.container.utils.database_engine import DatabaseEngine
2727
from tests.integration.container.utils.database_engine_deployment import \
2828
DatabaseEngineDeployment

tests/integration/container/test_read_write_splitting.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,13 @@ def props(self):
8282
@pytest.fixture(scope='class')
8383
def failover_props(self):
8484
return {
85-
"plugins": "read_write_splitting,failover", "connect_timeout": 10, "autocommit": True}
85+
"plugins": "read_write_splitting,failover",
86+
"socket_timeout": 30,
87+
"connect_timeout": 10,
88+
"monitoring-connect_timeout": 5,
89+
"monitoring-socket_timeout": 5,
90+
"autocommit": True
91+
}
8692

8793
@pytest.fixture(scope='class')
8894
def proxied_props(self, props, conn_utils):

0 commit comments

Comments
 (0)