kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ewe...@apache.org
Subject kafka git commit: MINOR: Fix system test broken by change of consumer group tool output format
Date Thu, 10 Mar 2016 19:12:19 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 1a451b481 -> 6eb061fa8


MINOR: Fix system test broken by change of consumer group tool output format

… format

Author: Gwen Shapira <cshapi@gmail.com>

Reviewers: Ewen Cheslack-Postava <ewen@confluent.io>

Closes #1039 from gwenshap/minor-consumer-groups


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/6eb061fa
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/6eb061fa
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/6eb061fa

Branch: refs/heads/trunk
Commit: 6eb061fa85de1b5346eb2652622c9c60f7f3baf1
Parents: 1a451b4
Author: Gwen Shapira <cshapi@gmail.com>
Authored: Thu Mar 10 11:12:07 2016 -0800
Committer: Ewen Cheslack-Postava <me@ewencp.org>
Committed: Thu Mar 10 11:12:07 2016 -0800

----------------------------------------------------------------------
 tests/kafkatest/services/kafka/kafka.py              | 2 +-
 tests/kafkatest/tests/consumer_group_command_test.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/6eb061fa/tests/kafkatest/services/kafka/kafka.py
----------------------------------------------------------------------
diff --git a/tests/kafkatest/services/kafka/kafka.py b/tests/kafkatest/services/kafka/kafka.py
index b9105df..358dacf 100644
--- a/tests/kafkatest/services/kafka/kafka.py
+++ b/tests/kafkatest/services/kafka/kafka.py
@@ -458,7 +458,7 @@ class KafkaService(JmxMixin, Service):
         output = ""
         self.logger.debug(cmd)
         for line in node.account.ssh_capture(cmd):
-            if not (line.startswith("SLF4J") or line.startswith("GROUP, TOPIC") or line.startswith("Could
not fetch offset")):
+            if not (line.startswith("SLF4J") or line.startswith("GROUP") 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/6eb061fa/tests/kafkatest/tests/consumer_group_command_test.py
----------------------------------------------------------------------
diff --git a/tests/kafkatest/tests/consumer_group_command_test.py b/tests/kafkatest/tests/consumer_group_command_test.py
index a7b43a1..1424d96 100644
--- a/tests/kafkatest/tests/consumer_group_command_test.py
+++ b/tests/kafkatest/tests/consumer_group_command_test.py
@@ -24,6 +24,7 @@ from kafkatest.services.console_consumer import ConsoleConsumer
 from kafkatest.services.security.security_config import SecurityConfig
 
 import os
+import re
 
 TOPIC = "topic-consumer-group-command"
 
@@ -80,7 +81,7 @@ class ConsumerGroupCommandTest(Test):
             command_config_file = self.COMMAND_CONFIG_FILE
 
         if group:
-            wait_until(lambda: ("%s, topic-consumer-group-command, 0," % group) in 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("%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,
                        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,


Mime
View raw message