SLIDER-622 TestZKIntegration tests failing on windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b181630a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b181630a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b181630a Branch: refs/heads/develop Commit: b181630ab5d01040ea8ca7d195b011421da65bd3 Parents: e01c5c7 Author: Steve Loughran <[email protected]> Authored: Fri Nov 7 19:22:23 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Fri Nov 7 19:22:23 2014 +0000 ---------------------------------------------------------------------- .../org/apache/slider/common/tools/TestZKIntegration.groovy | 2 +- .../test/groovy/org/apache/slider/test/MicroZKCluster.groovy | 4 ++-- .../org/apache/slider/test/YarnZKMiniClusterTestBase.groovy | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b181630a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestZKIntegration.groovy ---------------------------------------------------------------------- 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 @@ class TestZKIntegration extends YarnZKMiniClusterTestBase implements KeysForTest @Before void createCluster() { Configuration conf = configuration - createMicroZKCluster(conf) + createMicroZKCluster(methodName.methodName, conf) } @Test http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b181630a/slider-core/src/test/groovy/org/apache/slider/test/MicroZKCluster.groovy ---------------------------------------------------------------------- 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 @@ class MicroZKCluster implements Closeable { this.conf = conf } - void createCluster() { - zkService = new MicroZookeeperService("zookeeper") + void createCluster(String name) { + zkService = new MicroZookeeperService(name) zkService.init(conf) zkService.start() http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b181630a/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy ---------------------------------------------------------------------- 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.conf.Configuration 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 @@ public abstract class YarnZKMiniClusterTestBase extends YarnMiniClusterTestBase 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 @@ public abstract class YarnZKMiniClusterTestBase extends YarnMiniClusterTestBase 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() {
