fix(#3333): Improve test condition

deps/wazuh_testing/wazuh_testing/modules/aws/db_utils.py

@@ -92,25 +92,18 @@ def get_multiple_s3_db_row(table_name: str) -> Iterator[S3CloudTrailRow]:
  yield row_type(*row)
 
 
-def table_exists(table_name: str) -> bool:
- """Check if the given table name exists.
+def table_exists_or_has_values(table_name: str) -> bool:
+ """Check if the given table name exists. If exists check if has values.
 
  Args:
  table_name (str): Table name to search for.
 
  Returns:
- bool: True if exists else False.
+ bool: True if exists or has values else False.
  """
  connection = get_db_connection(S3_CLOUDTRAIL_DB_PATH)
  cursor = connection.cursor()
- query = """
- SELECT
- name
- FROM
- sqlite_master
- WHERE
- type ='table' AND
- name NOT LIKE 'sqlite_%';
- """
-
- return table_name in [result[0] for result in cursor.execute(query).fetchall()]
+ try:
+ return bool(cursor.execute(SELECT_QUERY_TEMPLATE.format(table_name=table_name)).fetchall())
+ except sqlite3.OperationalError:
+ return False

tests/integration/test_aws/test_path.py

@@ -3,7 +3,7 @@
 import pytest
 from wazuh_testing import T_10, T_20, global_parameters
 from wazuh_testing.modules.aws import event_monitor
-from wazuh_testing.modules.aws.db_utils import get_s3_db_row, s3_db_exists, table_exists
+from wazuh_testing.modules.aws.db_utils import get_s3_db_row, s3_db_exists, table_exists_or_has_values
 from wazuh_testing.tools.configuration import (
  get_test_cases_data,
  load_configuration_template,
@@ -150,4 +150,4 @@ def test_path(
  assert f"{bucket_name}/{path}/" == data.bucket_path
  assert data.log_key.startswith(f"{path}/")
  else:
- assert not table_exists(table_name=bucket_type)
+ assert not table_exists_or_has_values(table_name=bucket_type)

tests/integration/test_aws/test_path_suffix.py

@@ -3,7 +3,7 @@
 import pytest
 from wazuh_testing import T_10, T_20, global_parameters
 from wazuh_testing.modules.aws import event_monitor
-from wazuh_testing.modules.aws.db_utils import get_s3_db_row, s3_db_exists, table_exists
+from wazuh_testing.modules.aws.db_utils import get_s3_db_row, s3_db_exists, table_exists_or_has_values
 from wazuh_testing.tools.configuration import (
  get_test_cases_data,
  load_configuration_template,
@@ -153,4 +153,4 @@ def test_path_suffix(
  assert f"{bucket_name}/{path_suffix}/" == data.bucket_path
  assert data.log_key.startswith(f"AWSLogs/{path_suffix}/")
  else:
- assert not table_exists(table_name=bucket_type)
+ assert not table_exists_or_has_values(table_name=bucket_type)

tests/integration/test_aws/test_regions.py

@@ -7,7 +7,7 @@
 from wazuh_testing.modules.aws.db_utils import (
  get_multiple_s3_db_row,
  s3_db_exists,
- table_exists,
+ table_exists_or_has_values,
 )
 from wazuh_testing.tools.configuration import (
  get_test_cases_data,
@@ -160,4 +160,4 @@ def test_regions(
  else:
  assert row.log_key.split("/")[3] in regions_list
  else:
- assert not table_exists(table_name=bucket_type)
+ assert not table_exists_or_has_values(table_name=bucket_type)