Remove the need for storing an instance variable in FleetControllerTest

4 files changed, 20 insertions, 19 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java
index dc297e7a549..cb87536314f 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java
@@ -60,7 +60,7 @@ public class DatabaseTest extends FleetControllerTest {
 
         log.info("CHECK THAT WANTED STATES PERSIST FLEETCONTROLLER RESTART");
         stopFleetController();
-        startFleetController();
+        startFleetController(false);
 
         waitForState("version:\\d+ distributor:10 .2.s:d storage:10 .3.s:m .7.s:r");
         assertWantedStates(wantedStates);
@@ -124,7 +124,7 @@ public class DatabaseTest extends FleetControllerTest {
 
         stopFleetController();
         for (int i = 6; i < nodes.size(); ++i) nodes.get(i).disconnect();
-        startFleetController();
+        startFleetController(false);
 
         waitForState("version:\\d+ distributor:3 storage:7 .1.s:m .3.s:d .4.s:d .5.s:d .6.s:m");
 
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 6c41f54ae62..d8b7a3d863c 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
@@ -58,7 +58,6 @@ public abstract class FleetControllerTest implements Waiter {
 
     Supervisor supervisor;
     protected final FakeTimer timer = new FakeTimer();
-    boolean usingFakeTimer = false;
     protected Slobrok slobrok;
     protected FleetControllerOptions options;
     ZooKeeperTestServer zooKeeperServer;
@@ -139,7 +138,7 @@ public abstract class FleetControllerTest implements Waiter {
         return opts;
     }
 
-    void setUpSystem(boolean useFakeTimer, FleetControllerOptions options) throws Exception {
+    void setUpSystem(FleetControllerOptions options) throws Exception {
         log.log(Level.FINE, "Setting up system");
         slobrok = new Slobrok();
         this.options = options;
@@ -149,7 +148,6 @@ public abstract class FleetControllerTest implements Waiter {
             log.log(Level.FINE, "Set up new zookeeper server at " + this.options.zooKeeperServerAddress);
         }
         this.options.slobrokConnectionSpecs = getSlobrokConnectionSpecs(slobrok);
-        this.usingFakeTimer = useFakeTimer;
     }
 
     FleetController createFleetController(boolean useFakeTimer, FleetControllerOptions options, boolean startThread) throws Exception {
@@ -198,7 +196,7 @@ public abstract class FleetControllerTest implements Waiter {
     }
 
     protected void setUpFleetController(boolean useFakeTimer, FleetControllerOptions options, boolean startThread) throws Exception {
-        if (slobrok == null) setUpSystem(useFakeTimer, options);
+        if (slobrok == null) setUpSystem(options);
         if (fleetController == null) {
             fleetController = createFleetController(useFakeTimer, options, startThread);
         } else {
@@ -213,9 +211,9 @@ public abstract class FleetControllerTest implements Waiter {
         }
     }
 
-    void startFleetController() throws Exception {
+    void startFleetController(boolean useFakeTimer) throws Exception {
         if (fleetController == null) {
-            fleetController = createFleetController(usingFakeTimer, options, true);
+            fleetController = createFleetController(useFakeTimer, options, true);
         } else {
             log.log(Level.WARNING, "already started fleetcontroller, not starting another");
         }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
index 7609f891df8..8bf4a6ce1dd 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
@@ -42,7 +42,6 @@ public class MasterElectionTest extends FleetControllerTest {
             zooKeeperServer = new ZooKeeperTestServer();
         }
         slobrok = new Slobrok();
-        usingFakeTimer = useFakeTimer;
         this.options = options;
         this.options.zooKeeperSessionTimeout = defaultZkSessionTimeoutInMillis();
         this.options.zooKeeperServerAddress = zooKeeperServer.getAddress();
@@ -51,7 +50,7 @@ public class MasterElectionTest extends FleetControllerTest {
         for (int i=0; i<count; ++i) {
             FleetControllerOptions nodeOptions = options.clone();
             nodeOptions.fleetControllerIndex = i;
-            fleetControllers.add(createFleetController(usingFakeTimer, nodeOptions, true));
+            fleetControllers.add(createFleetController(useFakeTimer, nodeOptions, true));
         }
     }
 
@@ -112,7 +111,8 @@ public class MasterElectionTest extends FleetControllerTest {
         log.log(Level.INFO, "STARTING TEST: MasterElectionTest::testMasterElection()");
         FleetControllerOptions options = defaultOptions("mycluster");
         options.masterZooKeeperCooldownPeriod = 100;
-        setUpFleetController(5, false, options);
+        boolean usingFakeTimer = false;
+        setUpFleetController(5, usingFakeTimer, options);
         waitForMaster(0);
         log.log(Level.INFO, "SHUTTING DOWN FLEET CONTROLLER 0");
         fleetControllers.get(0).shutdown();
@@ -491,7 +491,8 @@ public class MasterElectionTest extends FleetControllerTest {
         options.clusterHasGlobalDocumentTypes = true;
         options.masterZooKeeperCooldownPeriod = 1;
         options.minTimeBeforeFirstSystemStateBroadcast = 100000;
-        setUpFleetController(3, false, options);
+        boolean useFakeTimer = false;
+        setUpFleetController(3, useFakeTimer, options);
         setUpVdsNodes(false, new DummyVdsNodeOptions());
         fleetController = fleetControllers.get(0); // Required to prevent waitForStableSystem from NPE'ing
         waitForMaster(0);
@@ -517,7 +518,7 @@ public class MasterElectionTest extends FleetControllerTest {
         waitForMaster(1);
         waitForCompleteCycle(1);
 
-        fleetControllers.set(0, createFleetController(usingFakeTimer, fleetControllers.get(0).getOptions(), true));
+        fleetControllers.set(0, createFleetController(useFakeTimer, fleetControllers.get(0).getOptions(), true));
         waitForMaster(0);
         waitForCompleteCycle(0);
 
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
index 24e65a89d2b..af4984bdb26 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
@@ -951,15 +951,16 @@ public class StateChangeTest extends FleetControllerTest {
         startingTest("StateChangeTest::testNoSystemStateBeforeInitialTimePeriod()");
         FleetControllerOptions options = defaultOptions("mycluster", createNodes(10));
         options.minTimeBeforeFirstSystemStateBroadcast = 3 * 60 * 1000;
-        setUpSystem(true, options);
-        setUpVdsNodes(true, new DummyVdsNodeOptions(), true);
+        setUpSystem(options);
+        boolean useFakeTimer = true;
+        setUpVdsNodes(useFakeTimer, new DummyVdsNodeOptions(), true);
         // Leave one node down to avoid sending cluster state due to having seen all node states.
         for (int i = 0; i < nodes.size(); ++i) {
             if (i != 3) {
                 nodes.get(i).connect();
             }
         }
-        setUpFleetController(true, options);
+        setUpFleetController(useFakeTimer, options);
 
         StateWaiter waiter = new StateWaiter(timer);
         fleetController.addSystemStateListener(waiter);
@@ -997,9 +998,10 @@ public class StateChangeTest extends FleetControllerTest {
         final FleetControllerOptions options = defaultOptions("mycluster", createNodes(10));
         options.minTimeBeforeFirstSystemStateBroadcast = 300 * 60 * 1000;
 
-        setUpSystem(true, options);
+        boolean useFakeTimer = true;
+        setUpSystem(options);
 
-        setUpVdsNodes(true, new DummyVdsNodeOptions(), true);
+        setUpVdsNodes(useFakeTimer, new DummyVdsNodeOptions(), true);
 
         for (DummyVdsNode node : nodes) {
             node.connect();
@@ -1007,7 +1009,7 @@ public class StateChangeTest extends FleetControllerTest {
         // Marking one node as 'initializing' improves testing of state later on.
         nodes.get(3).setNodeState(State.INITIALIZING);
 
-        setUpFleetController(true, options);
+        setUpFleetController(useFakeTimer, options);
 
         final StateWaiter waiter = new StateWaiter(timer);