Repository: phoenix Updated Branches: refs/heads/4.4-HBase-0.98 070d9abb1 -> 23d90c19c
PHOENIX-1941 Phoenix tests are failing in linux env with missing class: StaticMapping (Alicia Ying Shu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a006d81f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a006d81f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a006d81f Branch: refs/heads/4.4-HBase-0.98 Commit: a006d81f16332d2b49c38e5c78881039f353d522 Parents: 070d9ab Author: Nick Dimiduk <[email protected]> Authored: Wed Jun 17 12:17:33 2015 -0700 Committer: Nick Dimiduk <[email protected]> Committed: Wed Jun 17 12:49:40 2015 -0700 ---------------------------------------------------------------------- .../phoenix/end2end/End2EndTestDriver.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a006d81f/phoenix-core/src/it/java/org/apache/phoenix/end2end/End2EndTestDriver.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/End2EndTestDriver.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/End2EndTestDriver.java index 26d18cf..743f729 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/End2EndTestDriver.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/End2EndTestDriver.java @@ -21,6 +21,7 @@ package org.apache.phoenix.end2end; import java.io.IOException; import java.io.PrintStream; +import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -79,10 +80,20 @@ public class End2EndTestDriver extends AbstractHBaseTool { @Override public boolean isCandidateClass(Class<?> c) { - return testFilterRe.matcher(c.getName()).find() && - // Our pattern will match the below NON-IntegrationTest. Rather than - // do exotic regex, just filter it out here - super.isCandidateClass(c); + Annotation[] annotations = c.getAnnotations(); + for (Annotation curAnnotation : annotations) { + if (curAnnotation.toString().contains("NeedsOwnMiniClusterTest")) { + /* Skip tests that aren't designed to run against a live cluster. + * For a live cluster, we cannot bring it up and down as required + * for these tests to run. + */ + return false; + } + } + return testFilterRe.matcher(c.getName()).find() && + // Our pattern will match the below NON-IntegrationTest. Rather than + // do exotic regex, just filter it out here + super.isCandidateClass(c); } }
