From d15ec78127c5aa3c79156dd23eeeea769b52fc97 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Thu, 11 May 2023 09:44:47 +0200
Subject: Remove testname and logging related to starting and stopping

Not used, reintroduce using junit TestInfo class if needed
---
 .../clustercontroller/core/DistributionBitCountTest.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java
index cec23930ea8..77bf7895e8c 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java
@@ -17,7 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @ExtendWith(CleanupZookeeperLogsOnSuccess.class)
 public class DistributionBitCountTest extends FleetControllerTest {
 
-    private FleetControllerOptions setUpSystem(String testName) throws Exception {
+    private FleetControllerOptions setUpSystem() throws Exception {
         List<ConfiguredNode> configuredNodes = new ArrayList<>();
         for (int i = 0 ; i < 10; i++) {
             configuredNodes.add(new ConfiguredNode(i, false));
@@ -25,7 +25,6 @@ public class DistributionBitCountTest extends FleetControllerTest {
         var builder = defaultOptions("mycluster", configuredNodes);
         builder.setDistributionBits(17);
         setUpFleetController(false, builder);
-        startingTest(testName);
         List<DummyVdsNode> nodes = setUpVdsNodes(false, true, configuredNodes);
         for (DummyVdsNode node : nodes) {
             node.setNodeState(new NodeState(node.getType(), State.UP).setMinUsedBits(20));
@@ -41,7 +40,7 @@ public class DistributionBitCountTest extends FleetControllerTest {
      */
     @Test
     void testDistributionBitCountConfigIncrease() throws Exception {
-        var options = setUpSystem("DistributionBitCountTest::testDistributionBitCountConfigIncrease");
+        var options = setUpSystem();
         var builder = FleetControllerOptions.Builder.copy(options);
         builder.setDistributionBits(20);
         fleetController().updateOptions(builder.build());
@@ -58,7 +57,7 @@ public class DistributionBitCountTest extends FleetControllerTest {
      */
     @Test
     void testDistributionBitCountConfigDecrease() throws Exception {
-        FleetControllerOptions options = setUpSystem("DistributionBitCountTest::testDistributionBitCountConfigDecrease");
+        FleetControllerOptions options = setUpSystem();
         var builder = FleetControllerOptions.Builder.copy(options);
         builder.setDistributionBits(12);
         fleetController().updateOptions(builder.build());
@@ -68,13 +67,13 @@ public class DistributionBitCountTest extends FleetControllerTest {
     /**
      * Test that when storage node reports higher bit count, but another storage
      * node has equally low bitcount, the fleetcontroller does nothing.
-     *
+     * <p
      * Test that when storage node reports higher bit count, but another storage
      * node now being lowest, the fleetcontroller adjusts to use that bit in system state.
      */
     @Test
     void testStorageNodeReportingHigherBitCount() throws Exception {
-        setUpSystem("DistributionBitCountTest::testStorageNodeReportingHigherBitCount");
+        setUpSystem();
 
         nodes.get(1).setNodeState(new NodeState(NodeType.STORAGE, State.UP).setMinUsedBits(11));
         nodes.get(3).setNodeState(new NodeState(NodeType.STORAGE, State.UP).setMinUsedBits(11));
@@ -97,7 +96,7 @@ public class DistributionBitCountTest extends FleetControllerTest {
      */
     @Test
     void testStorageNodeReportingLowerBitCount() throws Exception {
-        setUpSystem("DistributionBitCountTest::testStorageNodeReportingLowerBitCount");
+        setUpSystem();
 
         nodes.get(1).setNodeState(new NodeState(NodeType.STORAGE, State.UP).setMinUsedBits(13));
         ClusterState currentState = waitForState("version:\\d+ bits:13 distributor:10 storage:10");
-- 
cgit v1.2.3