[helix] branch master updated: Stabilize TestTaskCurrentStatePathDisabled (#1597)

[al...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d67e1e5  Stabilize TestTaskCurrentStatePathDisabled (#1597)
d67e1e5 is described below

commit d67e1e52a918701bc4fdbe357bacc88af0ba8700
Author: Neal Sun <ne...@gmail.com>
AuthorDate: Wed Jan 6 15:18:52 2021 -0800

    Stabilize TestTaskCurrentStatePathDisabled (#1597)
    
    TestTaskCurrentStatePathDisabled could be unstable due to
    the assertNotNull it performs on current states, should use
    verify instead.
---
 .../task/TestTaskCurrentStatePathDisabled.java         | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskCurrentStatePathDisabled.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskCurrentStatePathDisabled.java
index 8882a09..fdb2b16 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskCurrentStatePathDisabled.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskCurrentStatePathDisabled.java
@@ -33,6 +33,7 @@ import org.apache.helix.task.TaskState;
 import org.apache.helix.task.TaskUtil;
 import org.apache.helix.zookeeper.impl.client.ZkClient;
 import org.testng.Assert;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -52,6 +53,12 @@ public class TestTaskCurrentStatePathDisabled extends TaskTestBase {
     super.beforeClass();
   }
 
+  @AfterClass
+  public void afterClass() throws Exception {
+    super.afterClass();
+    System.setProperty(SystemPropertyKeys.TASK_CURRENT_STATE_PATH_DISABLED, "false");
+  }
+
   @Test
   public void testTaskCurrentStatePathDisabled() throws Exception {
     String jobQueueName0 = TestHelper.getTestMethodName() + "_0";
@@ -72,8 +79,9 @@ public class TestTaskCurrentStatePathDisabled extends TaskTestBase {
     ZkClient clientP0 = (ZkClient) _participants[0].getZkClient();
     String sessionIdP0 = ZkTestHelper.getSessionId(clientP0);
     PropertyKey.Builder keyBuilder = _manager.getHelixDataAccessor().keyBuilder();
-    Assert.assertNotNull(_manager.getHelixDataAccessor()
-        .getProperty(keyBuilder.taskCurrentState(instanceP0, sessionIdP0, namespacedJobName0)));
+    Assert.assertTrue(TestHelper.verify(() -> _manager.getHelixDataAccessor()
+        .getProperty(keyBuilder.taskCurrentState(instanceP0, sessionIdP0, namespacedJobName0))
+        != null, TestHelper.WAIT_DURATION));
     Assert.assertNull(_manager.getHelixDataAccessor()
         .getProperty(keyBuilder.currentState(instanceP0, sessionIdP0, namespacedJobName0)));
 
@@ -91,10 +99,10 @@ public class TestTaskCurrentStatePathDisabled extends TaskTestBase {
     _driver.start(jobQueue1.build());
     String namespacedJobName1 = TaskUtil.getNamespacedJobName(jobQueueName1, "JOB1");
     _driver.pollForJobState(jobQueueName1, namespacedJobName1, TaskState.IN_PROGRESS);
+    Assert.assertTrue(TestHelper.verify(() -> _manager.getHelixDataAccessor()
+        .getProperty(keyBuilder.currentState(instanceP0, sessionIdP0, namespacedJobName1))
+        != null, TestHelper.WAIT_DURATION));
     Assert.assertNull(_manager.getHelixDataAccessor()
         .getProperty(keyBuilder.taskCurrentState(instanceP0, sessionIdP0, namespacedJobName1)));
-    Assert.assertNotNull(_manager.getHelixDataAccessor()
-        .getProperty(keyBuilder.currentState(instanceP0, sessionIdP0, namespacedJobName1)));
-    System.setProperty(SystemPropertyKeys.TASK_CURRENT_STATE_PATH_DISABLED, "false");
   }
 }