fix for sbt and new specs.

twitter-archive · May 4, 2010 · b5f32df · b5f32df
1 parent ce2a711
commit b5f32df
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/main/scala/com/twitter/flockdb/test/StaticEdges.scala b/src/main/scala/com/twitter/flockdb/test/StaticEdges.scala
@@ -23,8 +23,6 @@ import net.lag.logging.Logger
 
 
 object StaticEdges extends Database {
-  Configgy.configure("config/test.conf")
-
   val poolConfig = Configgy.config.configMap("db.connection_pool")
   val log = Logger.get
   val config = Configgy.config

diff --git a/src/test/scala/com/twitter/flockdb/ConfiguredSpecification.scala b/src/test/scala/com/twitter/flockdb/ConfiguredSpecification.scala
@@ -20,5 +20,7 @@ import net.lag.configgy.Configgy
 import org.specs.Specification
 
 abstract class ConfiguredSpecification extends Specification {
+  Configgy.configure("config/test.conf")
+
   lazy val config = Configgy.config
 }
diff --git a/src/test/scala/com/twitter/flockdb/integration/EdgesSpec.scala b/src/test/scala/com/twitter/flockdb/integration/EdgesSpec.scala
@@ -28,8 +28,8 @@ import conversions.SelectOperation._
 import test.{EdgesDatabase, StaticEdges}
 
 
-object EdgesSpec extends ConfiguredSpecification with EdgesDatabase with Eventually {
-  val poolConfig = config.configMap("db.connection_pool")
+class EdgesSpec extends ConfiguredSpecification with EdgesDatabase {
+  lazy val poolConfig = config.configMap("db.connection_pool")
 
   import StaticEdges._
 

diff --git a/src/test/scala/com/twitter/flockdb/integration/IntersectionSpec.scala b/src/test/scala/com/twitter/flockdb/integration/IntersectionSpec.scala
@@ -24,7 +24,7 @@ import test.{EdgesDatabase, StaticEdges}
 import thrift.{Page, QueryTerm, Results, SelectOperation, SelectOperationType}
 
 
-object IntersectionSpec extends ConfiguredSpecification with Eventually with EdgesDatabase {
+object IntersectionSpec extends ConfiguredSpecification with EdgesDatabase {
   val poolConfig = config.configMap("db.connection_pool")
 
   import StaticEdges._

diff --git a/src/test/scala/com/twitter/flockdb/integration/SelectCompilerSpec.scala b/src/test/scala/com/twitter/flockdb/integration/SelectCompilerSpec.scala
@@ -26,7 +26,7 @@ import test.{EdgesDatabase, StaticEdges}
 import thrift._
 
 
-object SelectCompilerSpec extends ConfiguredSpecification with Eventually with EdgesDatabase with JMocker with ClassMocker {
+object SelectCompilerSpec extends ConfiguredSpecification with EdgesDatabase with JMocker with ClassMocker {
   val poolConfig = config.configMap("db.connection_pool")
 
   import StaticEdges._

diff --git a/src/test/scala/com/twitter/flockdb/unit/DifferenceQuerySpec.scala b/src/test/scala/com/twitter/flockdb/unit/DifferenceQuerySpec.scala
@@ -25,7 +25,7 @@ import conversions.Results._
 import thrift.{Results, Page}
 
 
-object DifferenceQuerySpec extends ConfiguredSpecification with JMocker {
+class DifferenceQuerySpec extends ConfiguredSpecification with JMocker {
   "DifferenceQuery" should {
     val query1 = new queries.SeqQuery(List(1,2,3,4,5,6,7,8,9,10,11,12))
     val query2 = new queries.SeqQuery(List(3,4,7,11))