Repository: kafka Updated Branches: refs/heads/trunk 4b1415c10 -> d2792e356
KAFKA-2857; MINOR: Follow up to MINOR: Fix ResetIntegrationTest test failures KAFKA-2857 follow-up. Author: Vahid Hashemian <[email protected]> Reviewers: Jason Gustafson <[email protected]>, Ismael Juma <[email protected]> Closes #2636 from vahidhashemian/minor/kafka-2857-followup Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/d2792e35 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/d2792e35 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/d2792e35 Branch: refs/heads/trunk Commit: d2792e356ff9d3ed8b0484bf62ac98e85fdc26fa Parents: 4b1415c Author: Vahid Hashemian <[email protected]> Authored: Sat Mar 4 00:47:35 2017 +0000 Committer: Ismael Juma <[email protected]> Committed: Sat Mar 4 00:48:01 2017 +0000 ---------------------------------------------------------------------- .../apache/kafka/streams/integration/ResetIntegrationTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/d2792e35/streams/src/test/java/org/apache/kafka/streams/integration/ResetIntegrationTest.java ---------------------------------------------------------------------- diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/ResetIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/ResetIntegrationTest.java index 4804bfb..88a8545 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/ResetIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/ResetIntegrationTest.java @@ -22,7 +22,7 @@ import kafka.tools.StreamsResetter; import kafka.utils.MockTime; import kafka.utils.ZkUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; -import org.apache.kafka.common.errors.GroupCoordinatorNotAvailableException; +import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.security.JaasUtils; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.LongSerializer; @@ -122,9 +122,7 @@ public class ResetIntegrationTest { try { TestUtils.waitForCondition(consumerGroupInactive, TIMEOUT_MULTIPLIER * CLEANUP_CONSUMER_TIMEOUT, "Test consumer group active even after waiting " + (TIMEOUT_MULTIPLIER * CLEANUP_CONSUMER_TIMEOUT) + " ms."); - } catch (GroupCoordinatorNotAvailableException e) { - continue; - } catch (IllegalArgumentException e) { + } catch (TimeoutException e) { continue; } break;
