From d071db983718d7a025ced725ba42e498f60b5a6a Mon Sep 17 00:00:00 2001 From: Matthias Veit Date: Thu, 19 Jan 2017 15:28:52 +0100 Subject: [PATCH] Reenable Unstable KillServiceActorTest test cases. Summary: See https://github.com/mesosphere/marathon/issues/4721 Test Plan: sbt test Reviewers: jeschkies, unterstein Reviewed By: jeschkies, unterstein Subscribers: jenkins, marathon-team Differential Revision: https://phabricator.mesosphere.com/D423 --- .../core/task/termination/impl/KillServiceActor.scala | 2 -- .../core/task/termination/impl/KillServiceActorTest.scala | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/scala/mesosphere/marathon/core/task/termination/impl/KillServiceActor.scala b/src/main/scala/mesosphere/marathon/core/task/termination/impl/KillServiceActor.scala index 89b97f2c6ee..a6ab850382b 100644 --- a/src/main/scala/mesosphere/marathon/core/task/termination/impl/KillServiceActor.scala +++ b/src/main/scala/mesosphere/marathon/core/task/termination/impl/KillServiceActor.scala @@ -15,7 +15,6 @@ import mesosphere.marathon.core.task.termination.InstanceChangedPredicates.consi import mesosphere.marathon.core.task.Task.Id import scala.collection.mutable -import scala.collection.immutable.Seq import scala.concurrent.Promise import scala.util.Try @@ -39,7 +38,6 @@ import scala.util.Try * * See [[KillConfig]] for configuration options. */ -// TODO(PODS): use immutable.Seq instead of Seqs private[impl] class KillServiceActor( driverHolder: MarathonSchedulerDriverHolder, stateOpProcessor: TaskStateOpProcessor, diff --git a/src/test/scala/mesosphere/marathon/core/task/termination/impl/KillServiceActorTest.scala b/src/test/scala/mesosphere/marathon/core/task/termination/impl/KillServiceActorTest.scala index a2080631b37..83e28eb87c0 100644 --- a/src/test/scala/mesosphere/marathon/core/task/termination/impl/KillServiceActorTest.scala +++ b/src/test/scala/mesosphere/marathon/core/task/termination/impl/KillServiceActorTest.scala @@ -19,7 +19,6 @@ import mesosphere.marathon.core.task.tracker.TaskStateOpProcessor import mesosphere.marathon.raml.Resources import mesosphere.marathon.state.{ PathId, Timestamp } import mesosphere.marathon.stream._ -import mesosphere.Unstable import org.apache.mesos import org.apache.mesos.SchedulerDriver import org.mockito.ArgumentCaptor @@ -30,7 +29,6 @@ import org.scalatest.time.{ Seconds, Span } import scala.concurrent.Promise import scala.concurrent.duration._ -@UnstableTest class KillServiceActorTest extends AkkaUnitTest { override implicit def patienceConfig: PatienceConfig = PatienceConfig(timeout = scaled(Span(10, Seconds))) @@ -48,7 +46,6 @@ class KillServiceActorTest extends AkkaUnitTest { "The KillServiceActor" when { - // TODO(PODS): verify this test is still flaky https://github.com/mesosphere/marathon/issues/4202 "asked to kill a single known instance" should { "issue a kill to the driver" in withActor(defaultConfig) { (f, actor) => val instance = f.mockInstance(f.runSpecId, f.now(), mesos.Protos.TaskState.TASK_RUNNING) @@ -78,7 +75,7 @@ class KillServiceActorTest extends AkkaUnitTest { } "asked to kill single known unreachable instance" should { - "issue no kill to the driver because the task is unreachable and send an expunge" taggedAs (Unstable) in withActor(defaultConfig) { (f, actor) => + "issue no kill to the driver because the task is unreachable and send an expunge" in withActor(defaultConfig) { (f, actor) => val instance = f.mockInstance(f.runSpecId, f.now(), mesos.Protos.TaskState.TASK_UNREACHABLE) val promise = Promise[Done]() @@ -94,7 +91,7 @@ class KillServiceActorTest extends AkkaUnitTest { } "asked to kill multiple instances at once" should { - "issue three kill requests to the driver" taggedAs (Unstable) in withActor(defaultConfig) { (f, actor) => + "issue three kill requests to the driver" in withActor(defaultConfig) { (f, actor) => val runningInstance = f.mockInstance(f.runSpecId, f.clock.now(), mesos.Protos.TaskState.TASK_RUNNING) val unreachableInstance = f.mockInstance(f.runSpecId, f.clock.now(), mesos.Protos.TaskState.TASK_UNREACHABLE) val stagingInstance = f.mockInstance(f.runSpecId, f.clock.now(), mesos.Protos.TaskState.TASK_STAGING)