Repository: nifi Updated Branches: refs/heads/master 2b062e211 -> d7da04209
Fix for unit tests that are causing build failures in certain environments Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d7da0420 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d7da0420 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d7da0420 Branch: refs/heads/master Commit: d7da04209af6af42f8cb542c2c02779eb696a75f Parents: 2b062e2 Author: Mark Payne <[email protected]> Authored: Wed Feb 7 14:13:06 2018 -0500 Committer: Mark Payne <[email protected]> Committed: Wed Feb 7 15:08:52 2018 -0500 ---------------------------------------------------------------------- .../org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java | 3 +-- .../test/java/org/apache/nifi/jms/processors/PublishJMSTest.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/d7da0420/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java index 1a88b29..9825ea3 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java @@ -154,8 +154,7 @@ public class JMSPublisherConsumerTest { } } - - @Test(timeout = 2000000) + @Test(timeout = 20000) public void testMultipleThreads() throws Exception { String destinationName = "testQueue"; JmsTemplate publishTemplate = CommonTest.buildJmsTemplateForDestination(false); http://git-wip-us.apache.org/repos/asf/nifi/blob/d7da0420/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java index 1964ce9..06bd775 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java @@ -73,7 +73,7 @@ public class PublishJMSTest { assertEquals("cooQueue", ((Queue) message.getJMSReplyTo()).getQueueName()); assertEquals("foo", message.getStringProperty("foo")); - runner.run(1, true); // Run once just so that we can trigger the shutdown of the Connection Factory + runner.run(1, true, false); // Run once just so that we can trigger the shutdown of the Connection Factory } @Test @@ -111,7 +111,7 @@ public class PublishJMSTest { assertEquals("cooQueue", ((Queue) message.getJMSReplyTo()).getQueueName()); assertEquals("foo", message.getStringProperty("foo")); - runner.run(1, true); // Run once just so that we can trigger the shutdown of the Connection Factory + runner.run(1, true, false); // Run once just so that we can trigger the shutdown of the Connection Factory } @Test
