SLIDER-622 TestZKIntegration tests failing on windows
diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestZKIntegration.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestZKIntegration.groovy
index 836edbd..1b7ea52 100644
--- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestZKIntegration.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestZKIntegration.groovy
@@ -42,7 +42,7 @@
@Before
void createCluster() {
Configuration conf = configuration
- createMicroZKCluster(conf)
+ createMicroZKCluster(methodName.methodName, conf)
}
@Test
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/MicroZKCluster.groovy b/slider-core/src/test/groovy/org/apache/slider/test/MicroZKCluster.groovy
index 3d1a2d7..7affb44 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/MicroZKCluster.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/MicroZKCluster.groovy
@@ -44,8 +44,8 @@
this.conf = conf
}
- void createCluster() {
- zkService = new MicroZookeeperService("zookeeper")
+ void createCluster(String name) {
+ zkService = new MicroZookeeperService(name)
zkService.init(conf)
zkService.start()
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy
index 3fae9fd..d5d7ecf 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy
@@ -24,7 +24,6 @@
import org.apache.hadoop.io.IOUtils
import org.apache.hadoop.yarn.conf.YarnConfiguration
import org.apache.hadoop.registry.client.api.RegistryConstants
-import org.apache.slider.common.SliderXmlConfKeys
import org.apache.slider.core.zk.BlockingZKWatcher
import org.apache.slider.core.zk.ZKIntegration
@@ -101,7 +100,7 @@
int numLogDirs,
boolean startZK,
boolean startHDFS) {
- createMicroZKCluster(conf)
+ createMicroZKCluster("-${name?:'zk'}", conf)
conf.setBoolean(RegistryConstants.KEY_REGISTRY_ENABLED, true)
conf.set(RegistryConstants.KEY_REGISTRY_ZK_QUORUM, ZKBinding)
name = super.createMiniCluster(name, conf, noOfNodeManagers, numLocalDirs, numLogDirs,
@@ -137,9 +136,9 @@
return createMiniCluster("", conf, noOfNodeManagers, 1, 1, startZK, false)
}
- public void createMicroZKCluster(Configuration conf) {
+ public void createMicroZKCluster(String name, Configuration conf) {
microZKCluster = new MicroZKCluster(new Configuration(conf))
- microZKCluster.createCluster();
+ microZKCluster.createCluster(name);
}
void assertHasZKCluster() {
