[tika] branch main updated: TIKA-3932 -- temporary workaround :(

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/main by this push:
     new bc158d596 TIKA-3932 -- temporary workaround :(
bc158d596 is described below

commit bc158d59660f8588868f8687a87e389d8079b706
Author: tballison <ta...@apache.org>
AuthorDate: Thu Nov 17 14:31:17 2022 -0500

    TIKA-3932 -- temporary workaround :(
---
 .../org/apache/tika/pipes/kafka/tests/TikaPipesKafkaTest.java |  8 ++++++++
 .../org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java  | 11 ++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/tika-integration-tests/tika-pipes-kafka-integration-tests/src/test/java/org/apache/tika/pipes/kafka/tests/TikaPipesKafkaTest.java b/tika-integration-tests/tika-pipes-kafka-integration-tests/src/test/java/org/apache/tika/pipes/kafka/tests/TikaPipesKafkaTest.java
index c2edb8ac5..0938d9d90 100644
--- a/tika-integration-tests/tika-pipes-kafka-integration-tests/src/test/java/org/apache/tika/pipes/kafka/tests/TikaPipesKafkaTest.java
+++ b/tika-integration-tests/tika-pipes-kafka-integration-tests/src/test/java/org/apache/tika/pipes/kafka/tests/TikaPipesKafkaTest.java
@@ -18,6 +18,7 @@ package org.apache.tika.pipes.kafka.tests;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.File;
 import java.io.InputStream;
@@ -50,6 +51,7 @@ import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -61,6 +63,7 @@ import org.testcontainers.utility.DockerImageName;
 
 import org.apache.tika.cli.TikaCLI;
 import org.apache.tika.pipes.HandlerConfig;
+import org.apache.tika.utils.SystemUtils;
 
 /**
  * Test will emit some documents into a Kafka "pipe_iterator_topic", then kafka pipe iterator will
@@ -70,6 +73,11 @@ import org.apache.tika.pipes.HandlerConfig;
  */
 @Testcontainers(disabledWithoutDocker = true)
 public class TikaPipesKafkaTest {
+    @BeforeAll
+    public static void setUp() {
+        assumeTrue(!SystemUtils.IS_OS_MAC_OSX && !SystemUtils.OS_VERSION.equals("12.6.1"),
+                "This stopped working on macos x ... TIKA-3932");
+    }
     public static final String PIPE_ITERATOR_TOPIC = "pipe_iterator_topic";
     public static final String EMITTER_TOPIC = "emitter_topic";
     /**
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java
index 3e3d392aa..3cb6a6d20 100644
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java
@@ -16,11 +16,20 @@
  */
 package org.apache.tika.pipes.solr.tests;
 
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
+import org.apache.tika.utils.SystemUtils;
+
 @Testcontainers(disabledWithoutDocker = true)
 public class TikaPipesSolr6Test extends TikaPipesSolrTestBase {
-
+    @BeforeAll
+    public static void setUp() {
+        assumeTrue(!SystemUtils.IS_OS_MAC_OSX && !SystemUtils.OS_VERSION.equals("12.6.1"),
+                "This stopped working on macos x ... TIKA-3932");
+    }
     @Override
     public boolean useZk() {
         return false;