From 6d0a3f768cce960586dba7d94c06e43d5c78e23b Mon Sep 17 00:00:00 2001 From: Zachary Pinto Date: Wed, 25 Oct 2023 23:20:48 -0400 Subject: [PATCH] Fix tests to clean up after themselves. --- .../helix/integration/rebalancer/TestInstanceOperation.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestInstanceOperation.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestInstanceOperation.java index eafa73ea03..d3fc16be7f 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestInstanceOperation.java +++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestInstanceOperation.java @@ -405,6 +405,8 @@ public void testMarkEvacuationAfterEMM() throws Exception { Assert.assertTrue(newPAssignedParticipants.containsAll(currentActiveInstances)); } Assert.assertTrue(_admin.isReadyForPreparingJoiningCluster(CLUSTER_NAME, instanceToEvacuate)); + + _stateModelDelay = 3L; } @Test(dependsOnMethods = "testMarkEvacuationAfterEMM") @@ -441,6 +443,9 @@ public void testEvacuationWithOfflineInstancesInCluster() throws Exception { return true; }, 30000); } + + resetInstances(); + dropTestDBs(ImmutableSet.of("TEST_DB3_DELAYED_CRUSHED", "TEST_DB4_DELAYED_WAGED")); } @Test(expectedExceptions = HelixException.class, dependsOnMethods = "testEvacuationWithOfflineInstancesInCluster") @@ -450,7 +455,6 @@ public void testAddingNodeWithSwapOutInstanceOperation() throws Exception { System.currentTimeMillis())); resetInstances(); - dropTestDBs(ImmutableSet.of("TEST_DB3_DELAYED_CRUSHED", "TEST_DB4_DELAYED_WAGED")); // Set instance's InstanceOperation to SWAP_OUT String instanceToSwapOutName = _participants.get(0).getInstanceName();