[kafka] branch 2.1 updated: KAFKA-8245: Fix Flaky Test DeleteConsumerGroupsTest#testDeleteCmdAllGroups (#8032) (#8234)

[ijuma]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/2.1 by this push:
     new 54d3a4b  KAFKA-8245: Fix Flaky Test 
DeleteConsumerGroupsTest#testDeleteCmdAllGroups (#8032) (#8234)
54d3a4b is described below

commit 54d3a4bea42fd899076887a875b0a08e41c4fea9
Author: Vikas Singh <vi...@confluent.io>
AuthorDate: Thu Mar 5 19:00:53 2020 -0800

    KAFKA-8245: Fix Flaky Test DeleteConsumerGroupsTest#testDeleteCmdAllGroups 
(#8032) (#8234)
    
    Change unit tests to make sure the consumer group is in Stable state (i.e. 
consumers have completed joining the group)
    
    (cherry picked from commit 350dce865ae5420a25496bc502c55de4c15bf71e)
    
    Reviewers: Ismael Juma <ism...@juma.me.uk>
    
    Co-authored-by: Chia-Ping Tsai <chia7...@gmail.com>
---
 .../unit/kafka/admin/DeleteConsumerGroupsTest.scala  | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/core/src/test/scala/unit/kafka/admin/DeleteConsumerGroupsTest.scala 
b/core/src/test/scala/unit/kafka/admin/DeleteConsumerGroupsTest.scala
index f24d8d1..c3085c7 100644
--- a/core/src/test/scala/unit/kafka/admin/DeleteConsumerGroupsTest.scala
+++ b/core/src/test/scala/unit/kafka/admin/DeleteConsumerGroupsTest.scala
@@ -56,7 +56,7 @@ class DeleteConsumerGroupsTest extends 
ConsumerGroupCommandTest {
 
     val result = service.deleteGroups()
     assertTrue(s"The expected error (${Errors.GROUP_ID_NOT_FOUND}) was not 
detected while deleting consumer group",
-      result.size == 1 && result.keySet.contains(missingGroup) && 
result.get(missingGroup).get.getCause
+      result.size == 1 && result.keySet.contains(missingGroup) && 
result(missingGroup).getCause
         .isInstanceOf[GroupIdNotFoundException])
   }
 
@@ -93,7 +93,7 @@ class DeleteConsumerGroupsTest extends 
ConsumerGroupCommandTest {
 
     val result = service.deleteGroups()
     assertTrue(s"The expected error (${Errors.NON_EMPTY_GROUP}) was not 
detected while deleting consumer group",
-      result.size == 1 && result.keySet.contains(group) && 
result.get(group).get.getCause.isInstanceOf[GroupNotEmptyException])
+      result.size == 1 && result.keySet.contains(group) && 
result(group).getCause.isInstanceOf[GroupNotEmptyException])
   }
 
   @Test
@@ -106,7 +106,7 @@ class DeleteConsumerGroupsTest extends 
ConsumerGroupCommandTest {
     val service = getConsumerGroupService(cgcArgs)
 
     TestUtils.waitUntilTrue(() => {
-      service.listGroups().contains(group)
+      service.listGroups().contains(group) && 
service.collectGroupState().state == "Stable"
     }, "The group did not initialize as expected.", maxRetries = 3)
 
     executor.shutdown()
@@ -121,7 +121,7 @@ class DeleteConsumerGroupsTest extends 
ConsumerGroupCommandTest {
   }
 
   @Test
-  def testDeleteEmptyGroup() {
+  def testDeleteEmptyGroup(): Unit = {
     TestUtils.createOffsetsTopic(zkClient, servers)
 
     // run one consumer in the group
@@ -130,7 +130,7 @@ class DeleteConsumerGroupsTest extends 
ConsumerGroupCommandTest {
     val service = getConsumerGroupService(cgcArgs)
 
     TestUtils.waitUntilTrue(() => {
-      service.listGroups().contains(group)
+      service.listGroups().contains(group) && 
service.collectGroupState().state == "Stable"
     }, "The group did not initialize as expected.", maxRetries = 3)
 
     executor.shutdown()
@@ -141,7 +141,7 @@ class DeleteConsumerGroupsTest extends 
ConsumerGroupCommandTest {
 
     val result = service.deleteGroups()
     assertTrue(s"The consumer group could not be deleted as expected",
-      result.size == 1 && result.keySet.contains(group) && 
result.get(group).get == null)
+      result.size == 1 && result.keySet.contains(group) && result(group) == 
null)
   }
 
   @Test
@@ -155,7 +155,7 @@ class DeleteConsumerGroupsTest extends 
ConsumerGroupCommandTest {
     val service = getConsumerGroupService(cgcArgs)
 
     TestUtils.waitUntilTrue(() => {
-      service.listGroups().contains(group)
+      service.listGroups().contains(group) && 
service.collectGroupState().state == "Stable"
     }, "The group did not initialize as expected.", maxRetries = 3)
 
     executor.shutdown()
@@ -182,7 +182,7 @@ class DeleteConsumerGroupsTest extends 
ConsumerGroupCommandTest {
     val service = getConsumerGroupService(cgcArgs)
 
     TestUtils.waitUntilTrue(() => {
-      service.listGroups().contains(group)
+      service.listGroups().contains(group) && 
service.collectGroupState().state == "Stable"
     }, "The group did not initialize as expected.", maxRetries = 3)
 
     executor.shutdown()
@@ -195,8 +195,8 @@ class DeleteConsumerGroupsTest extends 
ConsumerGroupCommandTest {
     val result = service2.deleteGroups()
     assertTrue(s"The consumer group deletion did not work as expected",
       result.size == 2 &&
-        result.keySet.contains(group) && result.get(group).get == null &&
-        result.keySet.contains(missingGroup) && 
result.get(missingGroup).get.getMessage.contains(Errors.GROUP_ID_NOT_FOUND.message))
+        result.keySet.contains(group) && result(group) == null &&
+        result.keySet.contains(missingGroup) && 
result(missingGroup).getMessage.contains(Errors.GROUP_ID_NOT_FOUND.message))
   }
 
   @Test