From 259e5f8697871ea0aee601d62613367d7ab190e4 Mon Sep 17 00:00:00 2001 From: Georgios Gousios Date: Thu, 15 Dec 2011 17:20:28 +0200 Subject: [PATCH] Don't run spray tests by default --- .../test/scala/gr/grnet/aquarium/rest/actor/RESTActorTest.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/logic/src/test/scala/gr/grnet/aquarium/rest/actor/RESTActorTest.scala b/logic/src/test/scala/gr/grnet/aquarium/rest/actor/RESTActorTest.scala index 830e817..8795f30 100644 --- a/logic/src/test/scala/gr/grnet/aquarium/rest/actor/RESTActorTest.scala +++ b/logic/src/test/scala/gr/grnet/aquarium/rest/actor/RESTActorTest.scala @@ -39,7 +39,6 @@ import org.junit.Test import org.junit.Assert._ import org.junit.Assume.assumeTrue -import gr.grnet.aquarium.MasterConf import gr.grnet.aquarium.actor.RESTRole import cc.spray.can.HttpMethods.{GET, POST} import cc.spray.can.HttpClient._ @@ -49,6 +48,7 @@ import akka.actor.{PoisonPill, Actor} import gr.grnet.aquarium.logic.events.ResourceEvent import net.liftweb.json.JsonAST.JInt import gr.grnet.aquarium.util.json.JsonHelpers +import gr.grnet.aquarium.{LogicTestsAssumptions, MasterConf} /** * @@ -57,6 +57,8 @@ import gr.grnet.aquarium.util.json.JsonHelpers class RESTActorTest { @Test def testPing: Unit = { + assumeTrue(LogicTestsAssumptions.EnableSprayTests) + // Initialize configuration subsystem val mc = MasterConf.MasterConf mc.startServices() -- 1.7.10.4