Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion tests/integration/container/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,12 @@ def pytest_runtest_setup(item):
logger.warning("conftest.ExceptionWhileObtainingInstanceIDs", ex)
instances = list()

sleep(5)
# Only sleep if condition is still not met
if (len(instances) < request.get_num_of_instances()
or len(instances) == 0
or not rds_utility.is_db_instance_writer(instances[0])) and (
timeit.default_timer() - start_time) < 300:
sleep(5)

assert len(instances) > 0
current_writer = instances[0]
Expand Down Expand Up @@ -144,6 +149,7 @@ def pytest_runtest_setup(item):
MonitoringThreadContainer.clean_up()
ThreadPoolContainer.release_resources(wait=True)

ConnectionProviderManager.release_resources()
ConnectionProviderManager.reset_provider()
DatabaseDialectManager.reset_custom_dialect()
DriverDialectManager.reset_custom_dialect()
Expand Down
13 changes: 5 additions & 8 deletions tests/integration/container/test_read_write_splitting.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ def clear_caches(self):
RdsHostListProvider._topology_cache.clear()
RdsHostListProvider._is_primary_cluster_id_cache.clear()
RdsHostListProvider._cluster_ids_to_update.clear()
yield
ConnectionProviderManager.release_resources()
ConnectionProviderManager.reset_provider()
gc.collect()
ProxyHelper.enable_all_connectivity()

@pytest.fixture
def props(self, plugin_config, conn_utils):
Expand Down Expand Up @@ -196,14 +201,6 @@ def proxied_failover_props(self, failover_props, plugin_config, conn_utils):
)
return props_copy

@pytest.fixture(autouse=True)
def cleanup_connection_provider(self):
yield
ConnectionProviderManager.release_resources()
ConnectionProviderManager.reset_provider()
gc.collect()
ProxyHelper.enable_all_connectivity()

def test_connect_to_writer__switch_read_only(
self, test_driver: TestDriver, props, conn_utils, rds_utils
):
Expand Down
Loading