You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by rs...@apache.org on 2017/06/13 18:26:12 UTC
kafka git commit: MINOR: Clean up in DeleteConsumerGroupTest even if
test fails
Repository: kafka
Updated Branches:
refs/heads/trunk 85b7c855b -> 5c9557857
MINOR: Clean up in DeleteConsumerGroupTest even if test fails
Author: Rajini Sivaram <ra...@googlemail.com>
Reviewers: Ismael Juma <is...@juma.me.uk>
Closes #3317 from rajinisivaram/MINOR-deleteconsumergrouptest-cleanup
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/5c955785
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/5c955785
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/5c955785
Branch: refs/heads/trunk
Commit: 5c9557857602a4c5a57afd06d98447d02cc325c8
Parents: 85b7c85
Author: Rajini Sivaram <ra...@googlemail.com>
Authored: Tue Jun 13 19:25:53 2017 +0100
Committer: Rajini Sivaram <ra...@googlemail.com>
Committed: Tue Jun 13 19:25:53 2017 +0100
----------------------------------------------------------------------
.../kafka/admin/DeleteConsumerGroupTest.scala | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/5c955785/core/src/test/scala/unit/kafka/admin/DeleteConsumerGroupTest.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/unit/kafka/admin/DeleteConsumerGroupTest.scala b/core/src/test/scala/unit/kafka/admin/DeleteConsumerGroupTest.scala
index affdf01..aa202bc 100644
--- a/core/src/test/scala/unit/kafka/admin/DeleteConsumerGroupTest.scala
+++ b/core/src/test/scala/unit/kafka/admin/DeleteConsumerGroupTest.scala
@@ -163,7 +163,11 @@ class DeleteConsumerGroupTest extends KafkaServerTestHarness {
"Consumer group info on related topics should be deleted by DeleteAllConsumerGroupInfoForTopicInZK")
//produce events
val producer = TestUtils.createNewProducer(brokerList)
- produceEvents(producer, topic, List.fill(10)("test"))
+ try {
+ produceEvents(producer, topic, List.fill(10)("test"))
+ } finally {
+ producer.close()
+ }
//consume events
val consumerProps = TestUtils.createConsumerProperties(zkConnect, group, "consumer")
@@ -173,11 +177,13 @@ class DeleteConsumerGroupTest extends KafkaServerTestHarness {
consumerProps.put("fetch.wait.max.ms", "0")
val consumerConfig = new ConsumerConfig(consumerProps)
val consumerConnector: ConsumerConnector = Consumer.create(consumerConfig)
- val messageStream = consumerConnector.createMessageStreams(Map(topic -> 1))(topic).head
- consumeEvents(messageStream, 5)
- consumerConnector.commitOffsets(false)
- producer.close()
- consumerConnector.shutdown()
+ try {
+ val messageStream = consumerConnector.createMessageStreams(Map(topic -> 1))(topic).head
+ consumeEvents(messageStream, 5)
+ consumerConnector.commitOffsets(false)
+ } finally {
+ consumerConnector.shutdown()
+ }
TestUtils.waitUntilTrue(() => groupTopicOffsetAndOwnerDirsExist(dir),
"Consumer group info should exist after consuming from a recreated topic")