You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/09/20 23:59:20 UTC
[14/29] lucene-solr:jira/http2: SOLR-12759: detect actual problem and
only then "assumeTrue" to bail
SOLR-12759: detect actual problem and only then "assumeTrue" to bail
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5abee478
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5abee478
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5abee478
Branch: refs/heads/jira/http2
Commit: 5abee478b6c34cdb240674a9dc74830e476c11a5
Parents: 7d0a778
Author: David Smiley <ds...@apache.org>
Authored: Tue Sep 18 13:43:41 2018 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Tue Sep 18 13:43:41 2018 -0400
----------------------------------------------------------------------
.../handler/extraction/ExtractingRequestHandlerTest.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5abee478/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
index 852b7ce..85e1c78 100644
--- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
+++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
@@ -15,8 +15,11 @@
* limitations under the License.
*/
package org.apache.solr.handler.extraction;
+
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
@@ -41,8 +44,12 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- assumeFalse("SOLR-12759 JDK 11 (1st release) and Tika 1.x can result in extracting dates in a bad format.",
- System.getProperty("java.version").startsWith("11"));
+ // Is the JDK/env affected by a known bug?
+ if (!TimeZone.getDefault().getDisplayName(false, TimeZone.SHORT, Locale.US).matches("[A-Z]{3}([+-]\\d\\d(:\\d\\d)?)?")) {
+ assert System.getProperty("java.version").startsWith("11") : "Is some other JVM affected? Or bad regex?";
+ assumeTrue("SOLR-12759 JDK 11 (1st release) and Tika 1.x can result in extracting dates in a bad format.", false);
+ }
+
initCore("solrconfig.xml", "schema.xml", getFile("extraction/solr").getAbsolutePath());
}