Skip to content

KAFKA-7938: Fix test flakiness in DeleteConsumerGroupsTest #6312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vahidhashemian merged 1 commit into from
Feb 23, 2019
Merged

KAFKA-7938: Fix test flakiness in DeleteConsumerGroupsTest #6312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 5 additions & 27 deletions core/src/test/scala/unit/kafka/admin/DeleteConsumerGroupsTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ class DeleteConsumerGroupsTest extends ConsumerGroupCommandTest {
val service = getConsumerGroupService(cgcArgs)

TestUtils.waitUntilTrue(() => {
service.listGroups().contains(group)
service.collectGroupMembers(false)._2.get.size == 1
}, "The group did not initialize as expected.", maxRetries = 3)

val output = TestUtils.grabConsoleOutput(service.deleteGroups())
assertTrue(s"The expected error (${Errors.NON_EMPTY_GROUP}) was not detected while deleting consumer group",
assertTrue(s"The expected error (${Errors.NON_EMPTY_GROUP}) was not detected while deleting consumer group. Output was: (${output})",
output.contains(s"Group '$group' could not be deleted due to:") && output.contains(Errors.NON_EMPTY_GROUP.message))
}

Expand All @@ -88,11 +88,12 @@ class DeleteConsumerGroupsTest extends ConsumerGroupCommandTest {
val service = getConsumerGroupService(cgcArgs)

TestUtils.waitUntilTrue(() => {
service.listGroups().contains(group)
service.collectGroupMembers(false)._2.get.size == 1
}, "The group did not initialize as expected.", maxRetries = 3)

val result = service.deleteGroups()
assertTrue(s"The expected error (${Errors.NON_EMPTY_GROUP}) was not detected while deleting consumer group",
assertNotNull(s"Group was deleted successfully, but it shouldn't have been. Result was:(${result})", result.get(group).get)
assertTrue(s"The expected error (${Errors.NON_EMPTY_GROUP}) was not detected while deleting consumer group. Result was:(${result})",
result.size == 1 && result.keySet.contains(group) && result.get(group).get.getCause.isInstanceOf[GroupNotEmptyException])
}

Expand Down Expand Up @@ -199,29 +200,6 @@ class DeleteConsumerGroupsTest extends ConsumerGroupCommandTest {
result.keySet.contains(missingGroup) && result.get(missingGroup).get.getMessage.contains(Errors.GROUP_ID_NOT_FOUND.message))
}

@Test
def testDeleteCmdWithShortInitialization() {
// run one consumer in the group
addConsumerGroupExecutor(numConsumers = 1)
val cgcArgs = Array("--bootstrap-server", brokerList, "--delete", "--group", group)
val service = getConsumerGroupService(cgcArgs)

val output = TestUtils.grabConsoleOutput(service.deleteGroups())
assertTrue(s"The consumer group deletion did not work as expected",
output.contains(s"Group '$group' could not be deleted due to"))
}

@Test
def testDeleteWithShortInitialization() {
// run one consumer in the group
addConsumerGroupExecutor(numConsumers = 1)
val cgcArgs = Array("--bootstrap-server", brokerList, "--delete", "--group", group)
val service = getConsumerGroupService(cgcArgs)

val result = service.deleteGroups()
assertTrue(s"The consumer group deletion did not work as expected",
result.size == 1 && result.keySet.contains(group))
}

@Test(expected = classOf[OptionException])
def testDeleteWithUnrecognizedNewConsumerOption() {
Expand Down