kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ij...@apache.org
Subject kafka git commit: MINOR: Tweak detection of kafka server start-up in system tests
Date Tue, 12 Sep 2017 04:42:01 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 1f5bc11cc -> 439050816


MINOR: Tweak detection of kafka server start-up in system tests

Author: Ismael Juma <ismael@juma.me.uk>

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

Closes #3834 from ijuma/tweak-system-test-regex-for-detecting-server-start-up


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

Branch: refs/heads/trunk
Commit: 439050816bef679efe403447a88cbaac69769567
Parents: 1f5bc11
Author: Ismael Juma <ismael@juma.me.uk>
Authored: Tue Sep 12 05:41:46 2017 +0100
Committer: Ismael Juma <ismael@juma.me.uk>
Committed: Tue Sep 12 05:41:46 2017 +0100

----------------------------------------------------------------------
 tests/kafkatest/services/kafka/kafka.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/43905081/tests/kafkatest/services/kafka/kafka.py
----------------------------------------------------------------------
diff --git a/tests/kafkatest/services/kafka/kafka.py b/tests/kafkatest/services/kafka/kafka.py
index 10398c6..b3d6177 100644
--- a/tests/kafkatest/services/kafka/kafka.py
+++ b/tests/kafkatest/services/kafka/kafka.py
@@ -229,7 +229,8 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
         self.logger.debug("Attempting to start KafkaService on %s with command: %s" % (str(node.account),
cmd))
         with node.account.monitor_log(KafkaService.STDOUT_STDERR_CAPTURE) as monitor:
             node.account.ssh(cmd)
-            monitor.wait_until("Kafka Server.*started", timeout_sec=30, backoff_sec=.25,
err_msg="Kafka server didn't finish startup")
+            # Kafka 1.0.0 and higher don't have a space between "Kafka" and "Server"
+            monitor.wait_until("Kafka\s*Server.*started", timeout_sec=30, backoff_sec=.25,
err_msg="Kafka server didn't finish startup")
 
         # Credentials for inter-broker communication are created before starting Kafka.
         # Client credentials are created after starting Kafka so that both loading of


Mime
View raw message