phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tdsi...@apache.org
Subject [18/19] phoenix git commit: PHOENIX-2462 Add tephra test dependency to spark module
Date Tue, 01 Dec 2015 05:27:33 GMT
PHOENIX-2462 Add tephra test dependency to spark module


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7a4a7b05
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7a4a7b05
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7a4a7b05

Branch: refs/heads/4.x-HBase-1.0
Commit: 7a4a7b05de1756579a270884637681174b78f24c
Parents: 836e1a7
Author: Josh Mahonin <jmahonin@interset.com>
Authored: Mon Nov 30 11:30:04 2015 -0500
Committer: Thomas D'Silva <tdsilva@salesforce.com>
Committed: Mon Nov 30 20:23:36 2015 -0800

----------------------------------------------------------------------
 phoenix-spark/pom.xml                                         | 7 +++++++
 .../it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala    | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a4a7b05/phoenix-spark/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index eb8b233..973c9d0 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -471,6 +471,13 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+        <groupId>co.cask.tephra</groupId>
+        <artifactId>tephra-core</artifactId>
+        <type>test-jar</type>
+        <version>${tephra.version}</version>
+        <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a4a7b05/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
----------------------------------------------------------------------
diff --git a/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala b/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
index 5ae17da..1a9be6b 100644
--- a/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
+++ b/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
@@ -40,7 +40,11 @@ import scala.collection.mutable.ListBuffer
 // Helper object to access the protected abstract static methods hidden in BaseHBaseManagedTimeIT
 object PhoenixSparkITHelper extends BaseHBaseManagedTimeIT {
   def getTestClusterConfig = BaseHBaseManagedTimeIT.getTestClusterConfig
-  def doSetup = BaseHBaseManagedTimeIT.doSetup()
+  def doSetup = {
+    // The @ClassRule doesn't seem to be getting picked up, force creation here before setup
+    BaseTest.tmpFolder.create()
+    BaseHBaseManagedTimeIT.doSetup()
+  }
   def doTeardown = BaseHBaseManagedTimeIT.doTeardown()
   def getUrl = BaseTest.getUrl
 }


Mime
View raw message