Skip to content

Commit e45e963

Browse files
committed
style fix and updated condition in update_conf_group_protocol
1 parent a63cac4 commit e45e963

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

tests/common/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ def use_group_protocol_consumer():
5656
@staticmethod
5757
def update_conf_group_protocol(conf=None):
5858
if conf is not None and 'group.id' in conf and TestUtils.use_group_protocol_consumer():
59-
conf['group.protocol'] = 'consumer'
59+
if 'group.protocol' not in conf:
60+
conf['group.protocol'] = 'consumer'
6061

6162
@staticmethod
6263
def remove_forbidden_conf_group_protocol_consumer(conf):

tests/integration/admin/test_describe_operations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def verify_describe_groups(cluster, admin_client, topic):
184184
# Delete group
185185
perform_admin_operation_sync(admin_client.delete_consumer_groups, [group], request_timeout=10)
186186

187-
consumer_group = 'test-group-consumer'
187+
consumer_group = 'test-group-consumer'
188188

189189
consume_messages(cluster, consumer_group, 'consumer', topic, 2)
190190

0 commit comments

Comments
 (0)