Use an assert function available with the min base check (#17804)

* use an assert function avaialble with the min base check

* typo

* split test functions

* split test

Author: HadhemiDD

kafka_consumer/tests/common.py

@@ -103,15 +103,19 @@ def assert_check_kafka(aggregator, consumer_groups):
 
                 for mname in CONSUMER_METRICS:
                     aggregator.assert_metric(mname)
-                    t = tags + [f"consumer_group:{name}"]
-                    if aggregator.assert_metric_has_tags(mname, t):
-                        # Check for the tag consumer_group_state
-                        aggregator.assert_metric_has_tag_prefix(mname, tag_prefix='consumer_group_state')
+                    tags = tags + [f"consumer_group:{name}"]
 
     aggregator.assert_all_metrics_covered()
     aggregator.assert_metrics_using_metadata(get_metadata_metrics())
 
 
+def assert_check_kafka_has_consumer_group_state_tag(aggregator, consumer_groups):
+    for _, _ in consumer_groups.items():
+        for mname in CONSUMER_METRICS:
+            # Check for the tag prefix consumer_group_state
+            aggregator.assert_metric_has_tag_prefix(mname, tag_prefix='consumer_group_state')
+
+
 def get_authentication_configuration(instance):
     config = {}
 

kafka_consumer/tests/test_integration.py

@@ -12,7 +12,7 @@
 from datadog_checks.dev.utils import get_metadata_metrics
 
 from . import common
-from .common import assert_check_kafka, metrics
+from .common import assert_check_kafka, assert_check_kafka_has_consumer_group_state_tag, metrics
 
 pytestmark = [pytest.mark.integration, pytest.mark.usefixtures('dd_environment')]
 
@@ -40,6 +40,7 @@ def test_check_kafka(aggregator, check, kafka_instance, dd_run_check):
     """
     dd_run_check(check(kafka_instance))
     assert_check_kafka(aggregator, kafka_instance['consumer_groups'])
+    assert_check_kafka_has_consumer_group_state_tag(aggregator, kafka_instance['consumer_groups'])
 
 
 def test_can_send_event(aggregator, check, kafka_instance, dd_run_check):