Skip to content

Commit

Permalink
Props: Add another specs2 class to test for
Browse files Browse the repository at this point in the history
  • Loading branch information
Naftoli Gugenheim committed Jan 7, 2013
1 parent 7dfa004 commit 11f6078
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions core/util/src/main/scala/net/liftweb/util/Props.scala
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ object Props extends Logger {
val names = List( val names = List(
"org.apache.maven.surefire.booter.SurefireBooter", "org.apache.maven.surefire.booter.SurefireBooter",
"sbt.TestRunner", "sbt.TestRunner",
"org.specs2.runner.TestInterfaceRunner" // sometimes specs2 runs tests on another thread "org.specs2.runner.TestInterfaceRunner", // sometimes specs2 runs tests on another thread
"org.specs2.runner.TestInterfaceConsoleReporter",
"org.specs2.specification.FragmentExecution"
) )
if(st.exists(e => names.exists(e.getClassName.startsWith))) if(st.exists(e => names.exists(e.getClassName.startsWith)))
Test Test
Expand Down Expand Up @@ -208,7 +210,7 @@ object Props extends Logger {
* <b>before</b> you call anything else in Props. * <b>before</b> you call anything else in Props.
*/ */
@volatile var whereToLook: () => List[(String, () => Box[InputStream])] = () => Nil @volatile var whereToLook: () => List[(String, () => Box[InputStream])] = () => Nil



/** /**
* The map of key/value pairs retrieved from the property file. * The map of key/value pairs retrieved from the property file.
Expand All @@ -226,7 +228,7 @@ object Props extends Logger {
toTry.map{ toTry.map{
f => { f => {
val name = f() + "props" val name = f() + "props"
name -> {() => name -> {() =>
val res = tryo{getClass.getResourceAsStream(name)}.filter(_ ne null) val res = tryo{getClass.getResourceAsStream(name)}.filter(_ ne null)
trace("Trying to open resource %s. Result=%s".format(name, res)) trace("Trying to open resource %s. Result=%s".format(name, res))
res res
Expand Down

0 comments on commit 11f6078

Please sign in to comment.