Skip to content

build/tests: tests.ssl=false now works #4500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsmiley wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −4
Open

build/tests: tests.ssl=false now works #4500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28d6df
build/tests: tests.ssl=false now works
dsmiley Jun 5, 2026
b7834cc
use Hoss's suggestion. Fix one test to recover.
dsmiley Jun 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/testing/randomization.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ configure(allprojects.findAll {project -> project.path.startsWith(":solr")}) {
testOptions += [
[propName: 'tests.src.home', value: null, description: "See SOLR-14023."],
[propName: 'solr.tests.use.numeric.points', value: null, description: "Point implementation to use (true=numerics, false=trie)."],
[propName: 'tests.ssl', value: false, description: "Force SSL on for all tests that support it (respects @SuppressSSL)."],
[propName: 'tests.ssl', value: null, description: "Control SSL: true=force on, false=force off, unset=randomize (all respect @SuppressSSL)."],
]
}
}
Expand Down
10 changes: 8 additions & 2 deletions solr/core/src/test/org/apache/solr/handler/admin/api/GetMetricsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,14 @@ public static void beforeClass() throws Exception {

@AfterClass
public static void afterClass() throws Exception {
jettyHttpClient.destroy();
cluster.shutdown();
if (jettyHttpClient != null) {
jettyHttpClient.destroy();
jettyHttpClient = null;
}
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

@Before
Expand Down
10 changes: 9 additions & 1 deletion solr/test-framework/src/java/org/apache/solr/util/RandomizeSSL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/
package org.apache.solr.util;

import static org.junit.Assume.assumeFalse;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
Expand Down Expand Up @@ -126,8 +128,14 @@ public SSLTestConfig createSSLTestConfig() {
LuceneTestCase.TEST_NIGHTLY,
LuceneTestCase.RANDOM_MULTIPLIER));

if (Boolean.getBoolean("tests.ssl") && ssl > 0.0D) {
// a test can configure @RandomizeSSL(0.0) or with 1.0, and we must honor that.
final String sslProp = System.getProperty("tests.ssl");
if ("true".equals(sslProp)) {
assumeFalse("tests.ssl=true but test does not support SSL", ssl == 0.0);
return new SSLTestConfig(true, useClientAuth);
} else if ("false".equals(sslProp)) {
assumeFalse("tests.ssl=false but test requires SSL", ssl == 1.0);
return new SSLTestConfig(false, false);
}

return new SSLTestConfig(useSSL, useClientAuth);
Expand Down
Loading