Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16467: Add check for working locale in PackageManagerCLITest

Kevin Risden58617724d48f
diff --git a/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java b/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java
index 0403b48060d..665712bf28f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java
@@ -19,11 +19,14 @@ package org.apache.solr.cloud;
import java.lang.invoke.MethodHandles;
import java.util.Arrays;
+import java.util.Locale;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.core.TestSolrConfigHandler;
import org.apache.solr.util.LogLevel;
import org.apache.solr.util.PackageTool;
import org.apache.solr.util.SolrCLI;
+import org.apache.solr.util.SolrVersion;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
@@ -51,8 +54,18 @@ public class PackageManagerCLITest extends SolrCloudTestCase {
private static LocalWebServer repositoryServer;
+ @SuppressWarnings("AssertionFailureIgnored")
@BeforeClass
public static void setupCluster() throws Exception {
+ // Checks that semver4j works with configured locale */
+ try {
+ assertTrue(SolrVersion.valueOf("9.0.1").satisfies("~9.0"));
+ } catch (AssertionError e) {
+ SolrTestCaseJ4.assumeNoException(
+ "See SOLR-16467 - semver4j doesn't work with " + Locale.getDefault().toLanguageTag(),
+ new Exception(e));
+ }
+
System.setProperty("enable.packages", "true");
configureCluster(1)
@@ -69,8 +82,13 @@ public class PackageManagerCLITest extends SolrCloudTestCase {
@AfterClass
public static void teardown() throws Exception {
- repositoryServer.stop();
- System.clearProperty("enable.packages");
+ try {
+ if (repositoryServer != null) {
+ repositoryServer.stop();
+ }
+ } finally {
+ System.clearProperty("enable.packages");
+ }
}
@Test