diff options
| author | Harald Musum <musum@yahooinc.com> | 2022-01-10 09:42:00 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2022-01-10 09:42:00 +0100 |
| commit | 597792f3760034f2055b83c9518a9c328f39cb42 (patch) | |
| tree | 5d83e216de5f01f2a5aaaa3a81c6d4bdb99934be /config-model/src/test/java/com/yahoo | |
| parent | d6f4ce3a54daab7577b2b65432168aa65f00950d (diff) | |
Don't allow JVM option -Xrunjdwp:transport in hosted
Diffstat (limited to 'config-model/src/test/java/com/yahoo')
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java index 01f5e1ee776..ba27deedb61 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java @@ -200,9 +200,11 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase { return; } - Collections.sort(strings); + assertTrue("Expected 1 or more log messages for invalid JM options, got none", logger.msgs.size() > 0); Pair<Level, String> firstOption = logger.msgs.get(0); assertEquals(Level.WARNING, firstOption.getFirst()); + + Collections.sort(strings); assertEquals("Invalid JVM " + (optionName.equals("gc-options") ? "GC " : "") + "options in services.xml: " + String.join(",", strings), firstOption.getSecond()); } @@ -238,6 +240,11 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase { "$(touch /tmp/hello-from-gc-options)", "$(touch", "/tmp/hello-from-gc-options)"); + verifyLoggingOfJvmOptions(true, + "options", + "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005", + "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"); + verifyLoggingOfJvmOptions(false, "options", "$(touch /tmp/hello-from-gc-options)", @@ -246,7 +253,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase { // Valid options, should not log anything verifyLoggingOfJvmOptions(true, "options", "-Xms2G"); verifyLoggingOfJvmOptions(true, "options", "-verbose:gc"); - verifyLoggingOfJvmOptions(true, "options", "-Djava.library.path=/opt/vespa/lib64:/home/y/lib64 -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"); + verifyLoggingOfJvmOptions(true, "options", "-Djava.library.path=/opt/vespa/lib64:/home/y/lib64"); verifyLoggingOfJvmOptions(false, "options", "-Xms2G"); } |