[helix] branch ApplicationClusterManager updated: Fix NPR error in test for TestDelayedAutoRebalanceWithRackaware (#2606)

[xyuanlu]

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

xyuanlu pushed a commit to branch ApplicationClusterManager
in repository https://gitbox.apache.org/repos/asf/helix.git


The following commit(s) were added to refs/heads/ApplicationClusterManager by 
this push:
     new 0b5b54f84 Fix NPR error in test for 
TestDelayedAutoRebalanceWithRackaware (#2606)
0b5b54f84 is described below

commit 0b5b54f8424b4203e3aab494fa141c9d38580e57
Author: xyuanlu <xyua...@gmail.com>
AuthorDate: Wed Aug 23 14:03:48 2023 -0700

    Fix NPR error in test for TestDelayedAutoRebalanceWithRackaware (#2606)
---
 .../DelayedAutoRebalancer/TestDelayedAutoRebalance.java    |  2 +-
 .../TestDelayedAutoRebalanceWithRackaware.java             | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git 
a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
 
b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
index 5c99819d6..d5e823950 100644
--- 
a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
+++ 
b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
@@ -65,7 +65,7 @@ public class TestDelayedAutoRebalance extends ZkTestBase {
   protected int _minActiveReplica = _replica - 1;
   protected ZkHelixClusterVerifier _clusterVerifier;
   protected List<String> _testDBs = new ArrayList<>();
-  protected String _testingCondition;
+  protected String _testingCondition = OFFLINE_NODE;
   protected ConfigAccessor _configAccessor;
 
   @BeforeClass
diff --git 
a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java
 
b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java
index 9a2ccf90a..4af45320d 100644
--- 
a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java
+++ 
b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java
@@ -114,4 +114,18 @@ public class TestDelayedAutoRebalanceWithRackaware extends 
TestDelayedAutoRebala
   public void testDisableDelayRebalanceInInstance() throws Exception {
     super.testDisableDelayRebalanceInInstance();
   }
+
+  @Test(dependsOnMethods = {"testDisableDelayRebalanceInInstance"})
+  public void testOnDemandRebalance() throws Exception {
+    super.testOnDemandRebalance();
+  }
+
+  @Test(dependsOnMethods = {"testOnDemandRebalance"})
+  public void testExpiredOnDemandRebalanceTimestamp() throws Exception {
+    super.testExpiredOnDemandRebalanceTimestamp();
+  }
+  @Test(dependsOnMethods = {"testExpiredOnDemandRebalanceTimestamp"})
+  public void testOnDemandRebalanceAfterDelayRebalanceHappen() throws 
Exception {
+    super.testOnDemandRebalanceAfterDelayRebalanceHappen();
+  }
 }