You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by jg...@apache.org on 2016/10/01 00:16:23 UTC

kafka git commit: HOTFIX: Revert async change in ProduceConsumeValidateTest

Repository: kafka
Updated Branches:
  refs/heads/trunk 20322446a -> 788989158


HOTFIX: Revert async change in ProduceConsumeValidateTest

Author: Jason Gustafson <ja...@confluent.io>

Reviewers: Ismael Juma <is...@juma.me.uk>

Closes #1945 from hachikuji/hotfix-produce-consume-validate


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

Branch: refs/heads/trunk
Commit: 788989158a466aa89f030940a28d4f868e275ed7
Parents: 2032244
Author: Jason Gustafson <ja...@confluent.io>
Authored: Fri Sep 30 17:05:37 2016 -0700
Committer: Jason Gustafson <ja...@confluent.io>
Committed: Fri Sep 30 17:05:37 2016 -0700

----------------------------------------------------------------------
 tests/kafkatest/tests/produce_consume_validate.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/78898915/tests/kafkatest/tests/produce_consume_validate.py
----------------------------------------------------------------------
diff --git a/tests/kafkatest/tests/produce_consume_validate.py b/tests/kafkatest/tests/produce_consume_validate.py
index afb885d..9240f32 100644
--- a/tests/kafkatest/tests/produce_consume_validate.py
+++ b/tests/kafkatest/tests/produce_consume_validate.py
@@ -46,7 +46,7 @@ class ProduceConsumeValidateTest(Test):
     def setup_producer_and_consumer(self):
         raise NotImplementedError("Subclasses should implement this")
 
-    def start_producer_and_consumer(self, async=False):
+    def start_producer_and_consumer(self):
         # Start background producer and consumer
         self.consumer.start()
         if (self.consumer_init_timeout_sec > 0):
@@ -58,11 +58,11 @@ class ProduceConsumeValidateTest(Test):
                        self.consumer_init_timeout_sec)
 
         self.producer.start()
-        wait_until(lambda: async or self.producer.num_acked > 5,
+        wait_until(lambda: self.producer.num_acked > 5,
                    timeout_sec=self.producer_start_timeout_sec,
                    err_msg="Producer failed to produce messages for %ds." %\
                    self.producer_start_timeout_sec)
-        wait_until(lambda: async or len(self.consumer.messages_consumed[1]) > 0,
+        wait_until(lambda: len(self.consumer.messages_consumed[1]) > 0,
                    timeout_sec=self.consumer_start_timeout_sec,
                    err_msg="Consumer failed to consume messages for %ds." %\
                    self.consumer_start_timeout_sec)
@@ -89,10 +89,10 @@ class ProduceConsumeValidateTest(Test):
         self.producer.stop()
         self.consumer.wait()
 
-    def run_produce_consume_validate(self, async=False, core_test_action=None, *args):
+    def run_produce_consume_validate(self, core_test_action=None, *args):
         """Top-level template for simple produce/consume/validate tests."""
         try:
-            self.start_producer_and_consumer(async)
+            self.start_producer_and_consumer()
 
             if core_test_action is not None:
                 core_test_action(*args)