From e7a23602da63627f8b30e094bc41469c301891dd Mon Sep 17 00:00:00 2001
From: Tor Brede Vekterli <vekterli@vespa.ai>
Date: Mon, 4 Dec 2023 13:46:05 +0100
Subject: Use fake ZooKeeper database implementation for subset of CC tests

The fake impl acts "as if" a single-node ZK quorum is present, so it
cannot be directly used with most multi-node tests that require
multiple nodes to actually participate in leader elections.
---
 .../com/yahoo/vespa/clustercontroller/core/StateChangeTest.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java')

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 01987cf1f4c..9e9206526e5 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
@@ -9,7 +9,6 @@ import com.yahoo.vdslib.state.NodeType;
 import com.yahoo.vdslib.state.State;
 import com.yahoo.vespa.clustercontroller.core.testutils.StateWaiter;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -23,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@ExtendWith(CleanupZookeeperLogsOnSuccess.class)
 public class StateChangeTest extends FleetControllerTest {
 
     private final FakeTimer timer = new FakeTimer();
@@ -31,6 +29,10 @@ public class StateChangeTest extends FleetControllerTest {
     private FleetController ctrl;
     private DummyCommunicator communicator;
 
+    StateChangeTest() {
+        useRealZooKeeperInTest(false);
+    }
+
     private void initialize(FleetControllerOptions.Builder builder) throws Exception {
         List<Node> nodes = new ArrayList<>();
         for (int i = 0; i < builder.nodes().size(); ++i) {
@@ -38,7 +40,7 @@ public class StateChangeTest extends FleetControllerTest {
             nodes.add(new Node(NodeType.DISTRIBUTOR, i));
         }
 
-        setUpZooKeeperServer(builder);
+        builder.setDbFactoryFn(FakeZooKeeperDatabase.Factory::new);
         communicator = new DummyCommunicator(nodes, timer);
         boolean start = false;
         FleetControllerOptions options = builder.build();
-- 
cgit v1.2.3