Added common TestUtils

Author: pranavrth

tests/common/__init__.py

@@ -24,21 +24,23 @@
 _TRIVUP_CLUSTER_TYPE_ENV = 'TEST_TRIVUP_CLUSTER_TYPE'
 
 
-def _trivup_cluster_type_kraft():
-    return _TRIVUP_CLUSTER_TYPE_ENV in os.environ and os.environ[_TRIVUP_CLUSTER_TYPE_ENV] == 'kraft'
-
+def _update_conf_group_protocol(conf=None):
+    if conf is not None and 'group.id' in conf and TestUtils.use_group_protocol_consumer():
+        conf['group.protocol'] = 'consumer'
 
-def use_group_protocol_consumer():
-    return _GROUP_PROTOCOL_ENV in os.environ and os.environ[_GROUP_PROTOCOL_ENV] == 'consumer'
 
+def _trivup_cluster_type_kraft():
+    return _TRIVUP_CLUSTER_TYPE_ENV in os.environ and os.environ[_TRIVUP_CLUSTER_TYPE_ENV] == 'kraft'
 
-def use_kraft():
-    return use_group_protocol_consumer() or _trivup_cluster_type_kraft()
 
+class TestUtils:
+    @staticmethod
+    def use_kraft():
+        return TestUtils.use_group_protocol_consumer() or _trivup_cluster_type_kraft()
 
-def _update_conf_group_protocol(conf=None):
-    if conf is not None and 'group.id' in conf and use_group_protocol_consumer():
-        conf['group.protocol'] = 'consumer'
+    @staticmethod
+    def use_group_protocol_consumer():
+        return _GROUP_PROTOCOL_ENV in os.environ and os.environ[_GROUP_PROTOCOL_ENV] == 'consumer'
 
 
 class TestConsumer(Consumer):

tests/integration/conftest.py

@@ -17,7 +17,7 @@
 #
 
 import os
-from ..common import use_group_protocol_consumer, use_kraft
+from ..common import TestUtils
 import pytest
 
 from tests.integration.cluster_fixture import TrivupFixture
@@ -29,7 +29,7 @@
 def _broker_conf():
     broker_conf = ['transaction.state.log.replication.factor=1',
                    'transaction.state.log.min.isr=1']
-    if use_group_protocol_consumer():
+    if TestUtils.use_group_protocol_consumer():
         broker_conf.append('group.coordinator.rebalance.protocols=classic,consumer')
     return broker_conf
 
@@ -38,7 +38,7 @@ def create_trivup_cluster(conf={}):
     trivup_fixture_conf = {'with_sr': True,
                            'debug': True,
                            'cp_version': '7.6.0',
-                           'kraft': use_kraft(),
+                           'kraft': TestUtils.use_kraft(),
                            'version': 'trunk',
                            'broker_conf': _broker_conf()}
     trivup_fixture_conf.update(conf)
@@ -49,7 +49,7 @@ def create_sasl_cluster(conf={}):
     trivup_fixture_conf = {'with_sr': False,
                            'version': 'trunk',
                            'sasl_mechanism': "PLAIN",
-                           'kraft': use_kraft(),
+                           'kraft': TestUtils.use_kraft(),
                            'sasl_users': 'sasl_user=sasl_user',
                            'debug': True,
                            'cp_version': 'latest',