Move reporting of the scaling into the test itself

mesosphere · Aug 12, 2016 · 57c78a6 · 57c78a6
1 parent c66f0dd
commit 57c78a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/mesos-simulation/src/test/scala/mesosphere/mesos/scale/SingleAppScalingTest.scala b/mesos-simulation/src/test/scala/mesosphere/mesos/scale/SingleAppScalingTest.scala
@@ -2,12 +2,12 @@ package mesosphere.mesos.scale
 
 import java.io.File
 
-import mesosphere.marathon.api.v2.json.{ AppUpdate }
-import mesosphere.marathon.integration.facades.{ ITDeploymentResult, MarathonFacade }
+import mesosphere.marathon.api.v2.json.AppUpdate
+import mesosphere.marathon.integration.facades.ITDeploymentResult
+import mesosphere.marathon.integration.facades.MarathonFacade._
 import mesosphere.marathon.integration.setup._
-import MarathonFacade._
 import mesosphere.marathon.state.{ AppDefinition, PathId }
-import org.scalatest.{ BeforeAndAfter, GivenWhenThen, Matchers }
+import org.scalatest.{ BeforeAndAfter, ConfigMap, GivenWhenThen, Matchers }
 import org.slf4j.LoggerFactory
 import play.api.libs.json._
 
@@ -30,6 +30,14 @@ class SingleAppScalingTest
   //clean up state before running the test case
   before(cleanUp())
 
+  override def afterAll(configMap: ConfigMap): Unit = {
+    super.afterAll(configMap)
+    println()
+    DisplayAppScalingResults.displayMetrics(SingleAppScalingTest.metricsFile)
+    println()
+    DisplayAppScalingResults.displayAppInfoScaling(SingleAppScalingTest.appInfosFile)
+  }
+
   override def startMarathon(port: Int, args: String*): Unit = {
     val cwd = new File(".")
 

diff --git a/tests/integration/unit-integration-tests.sh b/tests/integration/unit-integration-tests.sh
@@ -31,7 +31,7 @@ export MARATHON_MAX_TASKS_PER_OFFER="${MARATHON_MAX_TASKS_PER_OFFER-1}"
 
 DOCKER_OPTIONS="run --entrypoint=/bin/bash --rm --name marathon-itests-$BUILD_ID --net host --privileged -e TARGETS_DIR=$TARGETS_DIR -e RUN_DOCKER_INTEGRATION_TESTS=$RUN_DOCKER_INTEGRATION_TESTS -e MARATHON_MAX_TASKS_PER_OFFER=$MARATHON_MAX_TASKS_PER_OFFER -v $WORKSPACE:/marathon -v $TARGET:/marathon/target -v /var/run/docker.sock:/var/run/docker.sock -v /etc/hosts:/etc/hosts -i"
 
-DOCKER_CMD="/usr/local/bin/sbt -Dsbt.log.format=false coverage doc test integration:test coverageReport coveralls mesos-simulation/integration:test \"mesos-simulation/test:runMain mesosphere.mesos.scale.DisplayAppScalingResults\""
+DOCKER_CMD="/usr/local/bin/sbt -Dsbt.log.format=false coverage doc test integration:test coverageReport coveralls mesos-simulation/integration:test"
 
 DOCKER_ARGS="$DOCKER_OPTIONS $TAGGED_IMAGE $DOCKER_CMD"