From c18c657255bb21189b2617c8a320191e60e4e169 Mon Sep 17 00:00:00 2001 From: Sviatoslav Boichuk Date: Mon, 25 Nov 2024 16:44:45 +0200 Subject: [PATCH] Added cleanup for each test case --- tests/conftest.py | 11 ++++++++++- utils/psql_client/psql_client.py | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index d9128c9..b356e30 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -67,9 +67,18 @@ def test_context(): ctx.device_sim.disconnect() - # Let's make sure we destroy default group after we're done with tests. + # Let's make sure we destroy all groups after we're done with tests. if ctx.kafka_producer.is_connected(): + # 1. Destroy default group ctx.kafka_producer.handle_single_group_delete(ctx.default_kafka_group()) + # 2. Get all groups from Redis or PostgeSQL + groups_list = ctx.psql_client.get_all_infrastructure_groups() + + if groups_list != None: + # 3. Interate over groups + for group in groups_list: + # 4. Send group_del request + ctx.kafka_producer.handle_single_group_delete(str(group[0])) # We have to clear any messages after done working with kafka if ctx.kafka_consumer.is_connected(): diff --git a/utils/psql_client/psql_client.py b/utils/psql_client/psql_client.py index 6405b5f..40f33e5 100644 --- a/utils/psql_client/psql_client.py +++ b/utils/psql_client/psql_client.py @@ -84,6 +84,15 @@ class PostgreSQLClient: return group_info + def get_all_infrastructure_groups(self) -> List[Tuple[int, int, int]]: + """Fetch group record by group id.""" + group_list = list() + + self.execute_query(f"select * from infrastructure_groups;") + group_list = self.fetchall() + + return group_list + def get_infra(self, mac: str) -> Tuple[str, int]: """Fetch group record by infra mac.""" infra_info = None