From ad64d8b1851a91362b3a15a7c5fb5c3703407c55 Mon Sep 17 00:00:00 2001
From: Aleksey Dukhovniy <adukhovniy@mesosphere.io>
Date: Thu, 19 Jan 2017 12:09:59 +0100
Subject: [PATCH] Mark MarathonSchedulerActorTest - Restart deployment after
 failover as stable again

Summary:
Couldn't find anything wrong with the test, so let's see how it behaves when marked as stable again.
If it fails we'll have more logs and I'll take a look at it again.

Fixes: #4933

Test Plan: unit-test

Reviewers: jeschkies, unterstein

Reviewed By: jeschkies, unterstein

Subscribers: jenkins, marathon-team

Differential Revision: https://phabricator.mesosphere.com/D429
---
 .../marathon/MarathonSchedulerActorTest.scala  | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/test/scala/mesosphere/marathon/MarathonSchedulerActorTest.scala b/src/test/scala/mesosphere/marathon/MarathonSchedulerActorTest.scala
index 0b273032bb9..b5e45b9e676 100644
--- a/src/test/scala/mesosphere/marathon/MarathonSchedulerActorTest.scala
+++ b/src/test/scala/mesosphere/marathon/MarathonSchedulerActorTest.scala
@@ -6,7 +6,6 @@ import akka.event.EventStream
 import akka.stream.scaladsl.Source
 import akka.testkit._
 import akka.util.Timeout
-import mesosphere.Unstable
 import mesosphere.marathon.MarathonSchedulerActor._
 import mesosphere.marathon.core.election.{ ElectionService, LocalLeadershipEvent }
 import mesosphere.marathon.core.event._
@@ -420,8 +419,7 @@ class MarathonSchedulerActorTest extends MarathonActorSupport
     }
   }
 
-  // Marked Unstab
-  test("Restart deployments after failover", Unstable) {
+  test("Restart deployments after failover") {
     val f = new Fixture
     import f._
     val app = AppDefinition(
@@ -439,19 +437,9 @@ class MarathonSchedulerActorTest extends MarathonActorSupport
     deploymentRepo.all() returns Source.single(plan)
     deploymentRepo.store(plan) returns Future.successful(Done)
     instanceTracker.specInstancesLaunchedSync(app.id) returns Seq.empty[Instance]
+    instanceTracker.specInstances(app.id) returns Future.successful(Seq.empty[Instance])
 
-    val schedulerActor = system.actorOf(
-      MarathonSchedulerActor.props(
-        schedulerActions,
-        deploymentManagerProps,
-        historyActorProps,
-        hcManager,
-        killService,
-        queue,
-        holder,
-        electionService,
-        system.eventStream
-      ))
+    val schedulerActor = createActor()
 
     try {
       schedulerActor ! LocalLeadershipEvent.ElectedAsLeader