From d2939fa39a31d4bda56b17cb0d439afba05af7ad Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Wed, 17 Apr 2013 22:20:51 +0200
Subject: [PATCH] Fix failing UnreachableNodeJoinsAgainSpec

* Shutting down test conductor controller is never a good idea
---
 .../scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala
index 1fea5d3ff8..18c3499fd7 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala
@@ -59,9 +59,8 @@ abstract class UnreachableNodeJoinsAgainSpec
     roles.filterNot(_ == role)
   }
 
-  lazy val sortedRoles = roles.sorted
-  lazy val master = sortedRoles(0)
-  lazy val victim = sortedRoles(1)
+  lazy val master = second
+  lazy val victim = fourth
 
   var endBarrierNumber = 0
   def endBarrier(): Unit = {
@@ -91,7 +90,7 @@ abstract class UnreachableNodeJoinsAgainSpec
 
       enterBarrier("unplug_victim")
 
-      val allButVictim = allBut(victim, sortedRoles)
+      val allButVictim = allBut(victim, roles)
       runOn(victim) {
         allButVictim.foreach(markNodeAsUnavailable(_))
         within(30 seconds) {