This is an automated email from the ASF dual-hosted git repository.
chinmayskulkarni pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new b29d201 PHOENIX-5864: RuleGeneratorTest unit test seem to be failing
b29d201 is described below
commit b29d201581bbfff3765c2e6bd17f514a4c46ec20
Author: Chinmay Kulkarni <chinmayskulka...@gmail.com>
AuthorDate: Fri Apr 24 15:46:30 2020 -0700
PHOENIX-5864: RuleGeneratorTest unit test seem to be failing
---
phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java | 6 +++---
.../src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java | 1 -
.../org/apache/phoenix/pherf/workload/MultiThreadedRunnerTest.java | 1 -
.../{timeout_test_scenario.xml => scenario_with_query_timeouts.xml} | 0
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
index be9b27a..c1a7b66 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
@@ -71,7 +71,7 @@ public class PherfMainIT extends ResultBaseTestIT {
String[] args = {"-q", "-l",
"-drop", "all",
"-schemaFile", ".*timeout_test_schema.sql",
- "-scenarioFile", ".*timeout_test_scenario.xml" };
+ "-scenarioFile", ".*scenario_with_query_timeouts.xml" };
Pherf p = new Pherf(args);
p.run();
@@ -93,7 +93,7 @@ public class PherfMainIT extends ResultBaseTestIT {
String[] args = {"-q", "-l",
"-drop", "all",
"-schemaFile", ".*timeout_test_schema.sql",
- "-scenarioFile", ".*timeout_test_scenario.xml" };
+ "-scenarioFile", ".*scenario_with_query_timeouts.xml" };
Pherf p = new Pherf(args);
p.run();
@@ -115,7 +115,7 @@ public class PherfMainIT extends ResultBaseTestIT {
String[] args = {"-q", "-l",
"-drop", "all",
"-schemaFile", ".*timeout_test_schema.sql",
- "-scenarioFile", ".*timeout_test_scenario.xml" };
+ "-scenarioFile", ".*scenario_with_query_timeouts.xml" };
Pherf p = new Pherf(args);
p.run();
diff --git
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
index 6d4e785..c439d38 100644
---
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
+++
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
@@ -46,7 +46,6 @@ import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
-import org.junit.Ignore;
import org.junit.Test;
public class RuleGeneratorTest {
diff --git
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/workload/MultiThreadedRunnerTest.java
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/workload/MultiThreadedRunnerTest.java
index d9c7ca3..592aceb 100644
---
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/workload/MultiThreadedRunnerTest.java
+++
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/workload/MultiThreadedRunnerTest.java
@@ -28,7 +28,6 @@ import org.apache.phoenix.pherf.rules.RulesApplier;
import org.apache.phoenix.util.DefaultEnvironmentEdge;
import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
diff --git
a/phoenix-pherf/src/test/resources/scenario/timeout_test_scenario.xml
b/phoenix-pherf/src/test/resources/scenario/scenario_with_query_timeouts.xml
similarity index 100%
rename from phoenix-pherf/src/test/resources/scenario/timeout_test_scenario.xml
rename to
phoenix-pherf/src/test/resources/scenario/scenario_with_query_timeouts.xml
