Avoid duplicating code

1 files changed, 5 insertions, 9 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index c39a5c52836..91a348ab1ba 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -176,12 +176,9 @@ public abstract class FleetControllerTest implements Waiter {
     }
 
     protected void setUpFleetController(boolean useFakeTimer, FleetControllerOptions options) throws Exception {
-        if (slobrok == null) setUpSystem(options);
-        if (fleetController == null) {
-            fleetController = createFleetController(useFakeTimer, options);
-        } else {
-            throw new Exception("called setUpFleetcontroller but it was already setup");
-        }
+        if (slobrok == null)
+            setUpSystem(options);
+        startFleetController(useFakeTimer);
     }
 
     void stopFleetController() throws Exception {
@@ -192,11 +189,10 @@ public abstract class FleetControllerTest implements Waiter {
     }
 
     void startFleetController(boolean useFakeTimer) throws Exception {
-        if (fleetController == null) {
+        if (fleetController == null)
             fleetController = createFleetController(useFakeTimer, options);
-        } else {
+        else
             log.log(Level.WARNING, "already started fleetcontroller, not starting another");
-        }
     }
 
     protected void setUpVdsNodes(boolean useFakeTimer, DummyVdsNodeOptions options) throws Exception {