From 98e76700439cd9f548a7007757faafff42c16fd4 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 7 Jul 2022 14:06:50 +0200 Subject: Remove use of 'enable-server-ocsp-stapling' feature flag --- .../vespa/model/container/ContainerClusterTest.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'config-model/src/test') diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 198b5713876..b634356fcb6 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -162,15 +162,15 @@ public class ContainerClusterTest { addContainer(root, cluster, "c1", "host-c1"); assertEquals(1, cluster.getContainers().size()); ApplicationContainer container = cluster.getContainers().get(0); - verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmOptions()); + verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, ""), container.getJvmOptions()); container.setJvmOptions("initial"); - verifyJvmArgs(isHosted, hasDocProc, "initial", container.getJvmOptions()); + verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "initial"), container.getJvmOptions()); container.prependJvmOptions("ignored"); - verifyJvmArgs(isHosted, hasDocProc, "ignored initial", container.getJvmOptions()); + verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "ignored initial"), container.getJvmOptions()); container.appendJvmOptions("override"); - verifyJvmArgs(isHosted, hasDocProc, "ignored initial override", container.getJvmOptions()); + verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, "ignored initial override"), container.getJvmOptions()); container.setJvmOptions(null); - verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmOptions()); + verifyJvmArgs(isHosted, hasDocProc, expectedJvmArgs(isHosted, ""), container.getJvmOptions()); } @Test @@ -510,4 +510,13 @@ public class ContainerClusterTest { return new ClusterInfoConfig(builder); } + private static String expectedJvmArgs(boolean isHosted, String extra) { + if (!isHosted) return extra; + return "-Djdk.tls.server.enableStatusRequestExtension=true " + + "-Djdk.tls.stapling.responseTimeout=2000 " + + "-Djdk.tls.stapling.cacheSize=256 " + + "-Djdk.tls.stapling.cacheLifetime=3600" + + (extra.isEmpty() ? "" : " " + extra); + } + } -- cgit v1.2.3