Revert "Launch Marathon sub-processes without test-classes"

This reverts commit 458c175.
janisz · Jan 31, 2017 · 3babb4f · 3babb4f
1 parent 458c175
commit 3babb4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/main/scala/mesosphere/marathon/core/base/RichRuntime.scala b/src/main/scala/mesosphere/marathon/core/base/RichRuntime.scala
@@ -28,13 +28,11 @@ case class RichRuntime(runtime: Runtime) extends StrictLogging {
     val promise = Promise[Done]()
     timer.schedule(new TimerTask {
       override def run(): Unit = {
+        logger.info("Halting JVM")
         promise.success(Done)
         // do nothing in tests: we can't guarantee we can block the exit
         if (!sys.props.get("java.class.path").exists(_.contains("test-classes"))) {
-          logger.info("Halting JVM")
           Runtime.getRuntime.halt(exitCode)
-        } else {
-          logger.info("Cowardly refusing to halt the JVM while running tests")
         }
       }
     }, waitForExit.toMillis)

diff --git a/src/test/scala/mesosphere/marathon/integration/setup/MarathonTest.scala b/src/test/scala/mesosphere/marathon/integration/setup/MarathonTest.scala
@@ -297,11 +297,7 @@ trait MarathonTest extends Suite with StrictLogging with ScalaFutures with Befor
 
   val appProxyMainInvocationImpl: String = {
     val javaExecutable = sys.props.get("java.home").fold("java")(_ + "/bin/java")
-    val classPath = sys.props.getOrElse("java.class.path", "target/classes").
-      replaceAll(" ", "").
-      split(":").
-      filterNot(_.contains("test-classes")).
-      mkString(":")
+    val classPath = sys.props.getOrElse("java.class.path", "target/classes").replaceAll(" ", "")
     val main = classOf[AppMock].getName
     val id = UUID.randomUUID.toString
     appProxyIds(_ += id)