1 files changed, 11 insertions, 17 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 cd36bf1eb37..49d04e20621 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
@@ -104,6 +104,7 @@ public abstract class FleetControllerTest implements Waiter {
         slobrok = new Slobrok();
         if (builder.zooKeeperServerAddress() != null) {
             zooKeeperServer = new ZooKeeperTestServer();
+            // Need to set zookeeper address again, as port number is not known until ZooKeeperTestServer has been created
             builder.setZooKeeperServerAddress(zooKeeperServer.getAddress());
             log.log(Level.FINE, "Set up new zookeeper server at " + zooKeeperServer.getAddress());
         }
@@ -150,15 +151,11 @@ public abstract class FleetControllerTest implements Waiter {
     protected FleetControllerOptions setUpFleetController(boolean useFakeTimer, FleetControllerOptions.Builder builder) throws Exception {
         if (slobrok == null) setUpSystem(builder);
         options = builder.build();
-        if (fleetControllers.isEmpty()) {
-            fleetControllers.add(createFleetController(useFakeTimer, options));
-        } else {
-            throw new Exception("called setUpFleetcontroller but it was already setup");
-        }
+        startFleetController(useFakeTimer);
         return options;
     }
 
-    void stopFleetController() throws Exception {
+    void stopFleetController() {
         fleetControllers.forEach(f -> {
             try {
                 f.shutdown();
@@ -170,25 +167,26 @@ public abstract class FleetControllerTest implements Waiter {
     }
 
     void startFleetController(boolean useFakeTimer) throws Exception {
-        if (fleetControllers.isEmpty()) {
-            fleetControllers.add(createFleetController(useFakeTimer, options));
-        } else {
-            log.log(Level.WARNING, "already started fleetcontroller, not starting another");
-        }
+        if ( ! fleetControllers.isEmpty()) throw new IllegalStateException("already started fleetcontroller, not starting another");
+
+        fleetControllers.add(createFleetController(useFakeTimer, options));
     }
 
     protected void setUpVdsNodes(boolean useFakeTimer) throws Exception {
         setUpVdsNodes(useFakeTimer, false);
     }
+
     protected void setUpVdsNodes(boolean useFakeTimer, boolean startDisconnected) throws Exception {
         setUpVdsNodes(useFakeTimer, startDisconnected, DEFAULT_NODE_COUNT);
     }
+
     protected void setUpVdsNodes(boolean useFakeTimer, boolean startDisconnected, int nodeCount) throws Exception {
         TreeSet<Integer> nodeIndexes = new TreeSet<>();
         for (int i = 0; i < nodeCount; ++i)
             nodeIndexes.add(this.nodes.size()/2 + i); // divide by 2 because there are 2 nodes (storage and distributor) per index
         setUpVdsNodes(useFakeTimer, startDisconnected, nodeIndexes);
     }
+
     protected void setUpVdsNodes(boolean useFakeTimer, boolean startDisconnected, Set<Integer> nodeIndexes) throws Exception {
         for (int nodeIndex : nodeIndexes) {
             nodes.add(createNode(useFakeTimer, startDisconnected, DISTRIBUTOR, nodeIndex));
@@ -254,7 +252,8 @@ public abstract class FleetControllerTest implements Waiter {
         subsetWaiter.waitForState(expectedState);
     }
 
-    protected void tearDownSystem() {
+    @AfterEach
+    public void tearDown() {
         if (testName != null) {
             //log.log(Level.INFO, "STOPPING TEST " + testName);
             System.err.println("STOPPING TEST " + testName);
@@ -281,11 +280,6 @@ public abstract class FleetControllerTest implements Waiter {
         }
     }
 
-    @AfterEach
-    public void tearDown() throws Exception {
-        tearDownSystem();
-    }
-
     public ClusterState waitForStableSystem() throws Exception { return waiter.waitForStableSystem(); }
     public ClusterState waitForStableSystem(int nodeCount) throws Exception { return waiter.waitForStableSystem(nodeCount); }
     public ClusterState waitForState(String state) throws Exception { return waiter.waitForState(state); }