Repository: tika
Updated Branches:
  refs/heads/2.x 7adfe1cb5 -> 7df6fe4be


TIKA-2170 fix unit test to allow for different exceptions depending on cause of 
timeout.


Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/7df6fe4b
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/7df6fe4b
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/7df6fe4b

Branch: refs/heads/2.x
Commit: 7df6fe4be6ac92fcf3ed7773ae83a1061ee8db02
Parents: 7adfe1c
Author: tballison <[email protected]>
Authored: Thu Nov 10 09:51:21 2016 -0500
Committer: tballison <[email protected]>
Committed: Thu Nov 10 09:51:21 2016 -0500

----------------------------------------------------------------------
 tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tika/blob/7df6fe4b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
----------------------------------------------------------------------
diff --git a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java 
b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
index 590aa80..5883c75 100644
--- a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
@@ -213,7 +213,7 @@ public class ForkParserTest {
         try {
             forkParser.parse(new 
ByteArrayInputStream(sleepCommand.getBytes(StandardCharsets.UTF_8)), o, m, c);
             fail("Should have thrown exception");
-        } catch (IOException e) {
+        } catch (IOException|TikaException e) {
             assertTrue("should have thrown IOException lost connection", true);
         }
     }

Reply via email to