From c63c5b593f0844173917ba31b99e4148c2706fd5 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Thu, 6 Oct 2022 23:30:20 +0200
Subject: No need for feature flag for max-merge-queue-size

---
 .../java/com/yahoo/vespa/model/content/StorageClusterTest.java    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'config-model/src/test/java/com/yahoo/vespa/model/content')

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index 8f9941820d6..f3a59733ece 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -120,9 +120,7 @@ public class StorageClusterTest {
         parse(cluster("foofighters", joinLines(
                 "<tuning>",
                 "  <merges max-per-node=\"1K\" max-queue-size=\"10K\"/>",
-                "</tuning>")),
-                new TestProperties().setMaxMergeQueueSize(1919)
-        ).getConfig(builder);
+                "</tuning>"))).getConfig(builder);
 
         StorServerConfig config = new StorServerConfig(builder);
         assertEquals(1024, config.max_merges_per_node());
@@ -174,9 +172,9 @@ public class StorageClusterTest {
 
     @Test
     void testMergeFeatureFlags() {
-        var config = configFromProperties(new TestProperties().setMaxMergeQueueSize(1919));
+        var config = configFromProperties(new TestProperties());
         assertEquals(16, config.max_merges_per_node());
-        assertEquals(1919, config.max_merge_queue_size());
+        assertEquals(100, config.max_merge_queue_size());
     }
 
     @Test
-- 
cgit v1.2.3