You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ij...@apache.org on 2016/10/25 12:08:04 UTC
kafka git commit: KAFKA-4339;
Update system tests to accommodate the new consumer group describe
output
Repository: kafka
Updated Branches:
refs/heads/trunk 986c15450 -> 2ac332e9c
KAFKA-4339; Update system tests to accommodate the new consumer group describe output
Author: Vahid Hashemian <va...@us.ibm.com>
Reviewers: Ismael Juma <is...@juma.me.uk>
Closes #2061 from vahidhashemian/KAFKA-4339
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/2ac332e9
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/2ac332e9
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/2ac332e9
Branch: refs/heads/trunk
Commit: 2ac332e9c9015964d993692c99c5ad19c9e2d56b
Parents: 986c154
Author: Vahid Hashemian <va...@us.ibm.com>
Authored: Tue Oct 25 13:07:50 2016 +0100
Committer: Ismael Juma <is...@juma.me.uk>
Committed: Tue Oct 25 13:07:50 2016 +0100
----------------------------------------------------------------------
tests/kafkatest/services/kafka/kafka.py | 2 +-
tests/kafkatest/tests/core/consumer_group_command_test.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/2ac332e9/tests/kafkatest/services/kafka/kafka.py
----------------------------------------------------------------------
diff --git a/tests/kafkatest/services/kafka/kafka.py b/tests/kafkatest/services/kafka/kafka.py
index 89cc312..2fe169b 100644
--- a/tests/kafkatest/services/kafka/kafka.py
+++ b/tests/kafkatest/services/kafka/kafka.py
@@ -518,7 +518,7 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
output = ""
self.logger.debug(cmd)
for line in node.account.ssh_capture(cmd):
- if not (line.startswith("SLF4J") or line.startswith("GROUP") or line.startswith("Could not fetch offset")):
+ if not (line.startswith("SLF4J") or line.startswith("TOPIC") or line.startswith("Could not fetch offset")):
output += line
self.logger.debug(output)
return output
http://git-wip-us.apache.org/repos/asf/kafka/blob/2ac332e9/tests/kafkatest/tests/core/consumer_group_command_test.py
----------------------------------------------------------------------
diff --git a/tests/kafkatest/tests/core/consumer_group_command_test.py b/tests/kafkatest/tests/core/consumer_group_command_test.py
index 1424d96..c3f59d9 100644
--- a/tests/kafkatest/tests/core/consumer_group_command_test.py
+++ b/tests/kafkatest/tests/core/consumer_group_command_test.py
@@ -81,7 +81,7 @@ class ConsumerGroupCommandTest(Test):
command_config_file = self.COMMAND_CONFIG_FILE
if group:
- wait_until(lambda: re.search("%s\s+topic-consumer-group-command\s+0"%group,self.kafka.describe_consumer_group(group=group, node=kafka_node, new_consumer=enable_new_consumer, command_config=command_config_file)), timeout_sec=10,
+ wait_until(lambda: re.search("topic-consumer-group-command",self.kafka.describe_consumer_group(group=group, node=kafka_node, new_consumer=enable_new_consumer, command_config=command_config_file)), timeout_sec=10,
err_msg="Timed out waiting to list expected consumer groups.")
else:
wait_until(lambda: "test-consumer-group" in self.kafka.list_consumer_groups(node=kafka_node, new_consumer=enable_new_consumer, command_config=command_config_file), timeout_sec=10,