You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by sl...@apache.org on 2014/01/11 01:34:34 UTC
git commit: [HELIX-350]cluster status monitor should not be reset in
FINALIZE type pipeline update a testcase, rb=16772
Updated Branches:
refs/heads/master 0e72af69c -> 2981d6aa8
[HELIX-350]cluster status monitor should not be reset in FINALIZE type pipeline update a testcase,rb=16772
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/2981d6aa
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/2981d6aa
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/2981d6aa
Branch: refs/heads/master
Commit: 2981d6aa8ac4c4d6f24d946cc41ff0edd822ad6f
Parents: 0e72af6
Author: slu2011 <lu...@gmail.com>
Authored: Fri Jan 10 16:34:17 2014 -0800
Committer: slu2011 <lu...@gmail.com>
Committed: Fri Jan 10 16:34:17 2014 -0800
----------------------------------------------------------------------
.../helix/monitoring/TestClusterStatusMonitorLifecycle.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/2981d6aa/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
index 373b024..65d60fb 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
@@ -11,6 +11,7 @@ import javax.management.MalformedObjectNameException;
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.TestHelper;
import org.apache.helix.integration.TestDistributedCMMain;
+import org.apache.helix.integration.ZkIntegrationTestBase;
import org.apache.helix.integration.manager.ClusterDistributedController;
import org.apache.helix.integration.manager.MockParticipantManager;
import org.apache.helix.model.IdealState;
@@ -23,7 +24,7 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-public class TestClusterStatusMonitorLifecycle extends TestDistributedCMMain{
+public class TestClusterStatusMonitorLifecycle extends ZkIntegrationTestBase{
MockParticipantManager[] _participants;
ClusterDistributedController[] _controllers;
@@ -35,7 +36,7 @@ public class TestClusterStatusMonitorLifecycle extends TestDistributedCMMain{
final int clusterNb = 10;
@BeforeClass
- public void testDistributedCMMain() throws Exception {
+ public void beforeClass() throws Exception {
String className = TestHelper.getTestClassName();
String methodName = TestHelper.getTestMethodName();
_clusterNamePrefix = className + "_" + methodName;
@@ -226,4 +227,4 @@ public class TestClusterStatusMonitorLifecycle extends TestDistributedCMMain{
}
-}
+}
\ No newline at end of file