incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [1/5] git commit: Refactoring all integration tests to run as a test suite in their own project. This is an effort to get the tests to run faster.
Date Mon, 08 Jun 2015 12:41:49 GMT
Repository: incubator-blur
Updated Branches:
  refs/heads/blur-it-tests [created] d87560921


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d8756092/blur-util/src/test/java/org/apache/blur/zookeeper/ZkMiniCluster.java
----------------------------------------------------------------------
diff --git a/blur-util/src/test/java/org/apache/blur/zookeeper/ZkMiniCluster.java b/blur-util/src/test/java/org/apache/blur/zookeeper/ZkMiniCluster.java
index 6dbbd93..c299d50 100644
--- a/blur-util/src/test/java/org/apache/blur/zookeeper/ZkMiniCluster.java
+++ b/blur-util/src/test/java/org/apache/blur/zookeeper/ZkMiniCluster.java
@@ -168,7 +168,7 @@ public class ZkMiniCluster {
         if (zkConnectionString == null) {
           continue;
         }
-        ZooKeeper zk = new ZooKeeper(getZkConnectionString(), 30000, new Watcher() {
+        ZooKeeper zk = new ZooKeeperClient(getZkConnectionString(), 30000, new Watcher()
{
           @Override
           public void process(WatchedEvent event) {
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d8756092/blur-util/src/test/java/org/apache/blur/zookeeper/ZkUtilsTest.java
----------------------------------------------------------------------
diff --git a/blur-util/src/test/java/org/apache/blur/zookeeper/ZkUtilsTest.java b/blur-util/src/test/java/org/apache/blur/zookeeper/ZkUtilsTest.java
index 6506e64..b0506e6 100644
--- a/blur-util/src/test/java/org/apache/blur/zookeeper/ZkUtilsTest.java
+++ b/blur-util/src/test/java/org/apache/blur/zookeeper/ZkUtilsTest.java
@@ -58,7 +58,7 @@ public class ZkUtilsTest {
   public void setUp() throws IOException, InterruptedException {
     final Object lock = new Object();
     synchronized (lock) {
-      _zooKeeper = new ZooKeeper(_zkMiniCluster.getZkConnectionString(), 10000, new Watcher()
{
+      _zooKeeper = new ZooKeeperClient(_zkMiniCluster.getZkConnectionString(), 10000, new
Watcher() {
         @Override
         public void process(WatchedEvent event) {
           synchronized (lock) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d8756092/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ec4766a..40d90aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,6 +425,9 @@ under the License.
 						<environmentVariables>
 							<JAVA_HOME>${java.home}</JAVA_HOME>
 						</environmentVariables>
+						<excludes>
+							<exclude>**/*IT.java</exclude>
+						</excludes>
 					</configuration>
 				</plugin>
 				<!-- Ignore/Execute plugin execution -->
@@ -512,6 +515,7 @@ under the License.
 				<module>blur-util</module>
 				<module>blur-status</module>
 				<module>blur-shell</module>
+				<module>blur-integration-tests</module>
 				<module>distribution</module>
 			</modules>
 		</profile>
@@ -538,6 +542,7 @@ under the License.
 				<module>blur-util</module>
 				<module>blur-status</module>
 				<module>blur-shell</module>
+				<module>blur-integration-tests</module>
 				<module>distribution</module>
 			</modules>
 		</profile>
@@ -564,6 +569,7 @@ under the License.
 				<module>blur-util</module>
 				<module>blur-status</module>
 				<module>blur-shell</module>
+				<module>blur-integration-tests</module>
 				<module>distribution</module>
 			</modules>
 		</profile>


Mime
View raw message