You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by yo...@apache.org on 2016/08/18 22:03:57 UTC
incubator-eagle git commit: EAGLE-472 Fix HBase unit test Fix HBase
unit test
Repository: incubator-eagle
Updated Branches:
refs/heads/develop 5bb91c4bd -> 2c63fdf0c
EAGLE-472 Fix HBase unit test
Fix HBase unit test
https://issues.apache.org/jira/browse/EAGLE-472
Author: @baibaichen <ba...@gmail.com>
Reviewer: @yonzhang <yo...@apache.org>
Closes: 357
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/2c63fdf0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/2c63fdf0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/2c63fdf0
Branch: refs/heads/develop
Commit: 2c63fdf0ce3b4edfa75c2bb3a9de838fdd8311b7
Parents: 5bb91c4
Author: yonzhang <yo...@gmail.com>
Authored: Thu Aug 18 15:07:55 2016 -0700
Committer: yonzhang <yo...@gmail.com>
Committed: Thu Aug 18 15:07:55 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/eagle/service/hbase/EmbeddedHbase.java | 2 +-
.../test/java/org/apache/eagle/service/hbase/TestHBaseBase.java | 4 +---
.../eagle/log/entity/TestGenericEntityIndexStreamReader.java | 1 -
.../eagle/log/entity/TestHBaseWriteEntitiesPerformance.java | 1 -
.../java/org/apache/eagle/log/entity/TestTestLogAPIEntity.java | 1 -
.../org/apache/eagle/service/generic/TestHBaseLogReader2.java | 1 -
.../org/apache/eagle/service/generic/TestListQueryResource.java | 1 -
.../java/org/apache/eagle/storage/hbase/TestHBaseStatement.java | 1 -
pom.xml | 2 +-
9 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2c63fdf0/eagle-core/eagle-embed/eagle-embed-hbase/src/main/java/org/apache/eagle/service/hbase/EmbeddedHbase.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-embed/eagle-embed-hbase/src/main/java/org/apache/eagle/service/hbase/EmbeddedHbase.java b/eagle-core/eagle-embed/eagle-embed-hbase/src/main/java/org/apache/eagle/service/hbase/EmbeddedHbase.java
index 7aafded..cbddc33 100644
--- a/eagle-core/eagle-embed/eagle-embed-hbase/src/main/java/org/apache/eagle/service/hbase/EmbeddedHbase.java
+++ b/eagle-core/eagle-embed/eagle-embed-hbase/src/main/java/org/apache/eagle/service/hbase/EmbeddedHbase.java
@@ -67,7 +67,7 @@ public class EmbeddedHbase {
conf.setInt("test.hbase.zookeeper.property.clientPort", port);
conf.set("zookeeper.znode.parent", znode);
conf.setInt("hbase.zookeeper.property.maxClientCnxns", 200);
- conf.set("hbase.master.ipc.address", "localhost");
+
conf.setInt("hbase.master.info.port", -1);//avoid port clobbering
// start mini hbase cluster
hBaseCluster = util.startMiniCluster();
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2c63fdf0/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/TestHBaseBase.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/TestHBaseBase.java b/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/TestHBaseBase.java
index 1612eed..5b72ed2 100644
--- a/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/TestHBaseBase.java
+++ b/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/TestHBaseBase.java
@@ -20,7 +20,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.Ignore;
-@Ignore
public class TestHBaseBase {
protected static EmbeddedHbase hbase;
@@ -30,9 +29,8 @@ public class TestHBaseBase {
}
@Test
- @Ignore(value="get rid of false failures")
+ @Ignore(value="get rid of No runnable methods")
public void test() {
}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2c63fdf0/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestGenericEntityIndexStreamReader.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestGenericEntityIndexStreamReader.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestGenericEntityIndexStreamReader.java
index c9c8ec5..22ae25a 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestGenericEntityIndexStreamReader.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestGenericEntityIndexStreamReader.java
@@ -33,7 +33,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-@Ignore(value="get rid of false failures")
public class TestGenericEntityIndexStreamReader extends TestHBaseBase {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2c63fdf0/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseWriteEntitiesPerformance.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseWriteEntitiesPerformance.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseWriteEntitiesPerformance.java
index 36fc74d..ceab684 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseWriteEntitiesPerformance.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseWriteEntitiesPerformance.java
@@ -31,7 +31,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
-@Ignore(value="get rid of false failures")
public class TestHBaseWriteEntitiesPerformance extends TestHBaseBase {
private EntityDefinition ed;
private final static Logger LOG = LoggerFactory.getLogger(TestHBaseWriteEntitiesPerformance.class);
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2c63fdf0/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestTestLogAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestTestLogAPIEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestTestLogAPIEntity.java
index 2e6a725..7ed98df 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestTestLogAPIEntity.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestTestLogAPIEntity.java
@@ -34,7 +34,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-@Ignore(value="get rid of false failures")
public class TestTestLogAPIEntity extends TestHBaseBase {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2c63fdf0/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestHBaseLogReader2.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestHBaseLogReader2.java b/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestHBaseLogReader2.java
index 701a805..abe6a0c 100755
--- a/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestHBaseLogReader2.java
+++ b/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestHBaseLogReader2.java
@@ -39,7 +39,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
-@Ignore
public class TestHBaseLogReader2 {
private final static Logger LOG = LoggerFactory.getLogger(TestHBaseLogReader2.class);
private static EmbeddedHbase hbase = EmbeddedHbase.getInstance();
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2c63fdf0/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java b/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
index 0f5a049..7384c70 100755
--- a/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
+++ b/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
@@ -38,7 +38,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-@Ignore
public class TestListQueryResource extends TestHBaseBase {
HTableInterface table;
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2c63fdf0/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/TestHBaseStatement.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/TestHBaseStatement.java b/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/TestHBaseStatement.java
index 9b6dfe7..f8e6c23 100644
--- a/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/TestHBaseStatement.java
+++ b/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/TestHBaseStatement.java
@@ -40,7 +40,6 @@ import org.apache.eagle.common.DateTimeUtil;
/**
* @since 3/23/15
*/
-@Ignore
public class TestHBaseStatement extends TestHBaseBase {
EntityDefinition entityDefinition;
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2c63fdf0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 087d2f5..04589f9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -201,7 +201,7 @@
<!-- Serialization -->
<gson.version>2.2.2</gson.version>
- <guava.version>19.0</guava.version>
+ <guava.version>15.0</guava.version>
<fasterxml-jackson.version>2.5.4</fasterxml-jackson.version>
<codehaus-jackson.version>1.9.13</codehaus-jackson.version>
<jsoup.version>1.7.3</jsoup.version>