kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rha...@apache.org
Subject [kafka] branch 2.3 updated: MINOR: Simplify the timeout logic to handle protocol in Connect distributed system tests (#7806)
Date Tue, 10 Dec 2019 18:32:44 GMT
This is an automated email from the ASF dual-hosted git repository.

rhauch pushed a commit to branch 2.3
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/2.3 by this push:
     new 8aaffd8  MINOR: Simplify the timeout logic to handle  protocol in Connect distributed
system tests (#7806)
8aaffd8 is described below

commit 8aaffd8298e11a59d835095b0fc42fd59c9ff875
Author: Randall Hauch <rhauch@gmail.com>
AuthorDate: Tue Dec 10 12:30:49 2019 -0600

    MINOR: Simplify the timeout logic to handle  protocol in Connect distributed system tests
(#7806)
---
 tests/kafkatest/tests/connect/connect_distributed_test.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/tests/kafkatest/tests/connect/connect_distributed_test.py b/tests/kafkatest/tests/connect/connect_distributed_test.py
index e50efb5..0dddeee 100644
--- a/tests/kafkatest/tests/connect/connect_distributed_test.py
+++ b/tests/kafkatest/tests/connect/connect_distributed_test.py
@@ -311,14 +311,9 @@ class ConnectDistributedTest(Test):
 
         self.cc.restart()
 
-        if connect_protocol == 'compatible':
-            timeout_sec = 120
-        else:
-            timeout_sec = 70
-
         # we should still be paused after restarting
         for node in self.cc.nodes:
-            wait_until(lambda: self.is_paused(self.source, node), timeout_sec=timeout_sec,
+            wait_until(lambda: self.is_paused(self.source, node), timeout_sec=120,
                        err_msg="Failed to see connector startup in PAUSED state")
 
     @cluster(num_nodes=6)
@@ -350,14 +345,9 @@ class ConnectDistributedTest(Test):
         # only processing new data.
         self.cc.restart()
 
-        if connect_protocol == 'compatible':
-            timeout_sec = 150
-        else:
-            timeout_sec = 70
-
         for node in self.cc.nodes:
             node.account.ssh("echo -e -n " + repr(self.SECOND_INPUTS) + " >> " + self.INPUT_FILE)
-        wait_until(lambda: self._validate_file_output(self.FIRST_INPUT_LIST + self.SECOND_INPUT_LIST),
timeout_sec=timeout_sec, err_msg="Sink output file never converged to the same state as the
input file")
+        wait_until(lambda: self._validate_file_output(self.FIRST_INPUT_LIST + self.SECOND_INPUT_LIST),
timeout_sec=150, err_msg="Sink output file never converged to the same state as the input
file")
 
     @cluster(num_nodes=6)
     @matrix(clean=[True, False], connect_protocol=['compatible', 'eager'])


Mime
View raw message