Repository: nifi Updated Branches: refs/heads/master 707aeb423 -> 87d96c022
NIFI-1872: Allow sufficient time for embedded server to startup for unit tests Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/87d96c02 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/87d96c02 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/87d96c02 Branch: refs/heads/master Commit: 87d96c022545dd359aa61113ff80b07348eb9bc3 Parents: 707aeb4 Author: Mark Payne <[email protected]> Authored: Fri May 13 13:28:38 2016 -0400 Committer: Mark Payne <[email protected]> Committed: Fri May 13 13:28:38 2016 -0400 ---------------------------------------------------------------------- .../zookeeper/TestZooKeeperStateProvider.java | 61 +++++++++++++------- 1 file changed, 40 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/87d96c02/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/TestZooKeeperStateProvider.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/TestZooKeeperStateProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/TestZooKeeperStateProvider.java index 54ce11e..8ce97fa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/TestZooKeeperStateProvider.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/TestZooKeeperStateProvider.java @@ -17,6 +17,12 @@ package org.apache.nifi.controller.state.providers.zookeeper; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.net.ssl.SSLContext; + import org.apache.curator.test.TestingServer; import org.apache.nifi.attribute.expression.language.StandardPropertyValue; import org.apache.nifi.components.PropertyDescriptor; @@ -27,15 +33,9 @@ import org.apache.nifi.components.state.exception.StateTooLargeException; import org.apache.nifi.controller.state.providers.AbstractTestStateProvider; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.testng.Assert; -import javax.net.ssl.SSLContext; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - public class TestZooKeeperStateProvider extends AbstractTestStateProvider { private StateProvider provider; @@ -117,9 +117,8 @@ public class TestZooKeeperStateProvider extends AbstractTestStateProvider { } - @Test - @Ignore("Needs to be fixed as it intermittently fails.") - public void testStateTooLargeExceptionThrownOnSetState() { + @Test(timeout = 20000) + public void testStateTooLargeExceptionThrownOnSetState() throws InterruptedException { final Map<String, String> state = new HashMap<>(); final StringBuilder sb = new StringBuilder(); @@ -133,21 +132,29 @@ public class TestZooKeeperStateProvider extends AbstractTestStateProvider { state.put("numbers." + i, sb.toString()); } - try { - getProvider().setState(state, componentId); - Assert.fail("Expected StateTooLargeException"); - } catch (final StateTooLargeException stle) { - // expected behavior. - } catch (final Exception e) { - e.printStackTrace(); - Assert.fail("Expected StateTooLargeException but " + e.getClass() + " was thrown", e); + while (true) { + try { + getProvider().setState(state, componentId); + Assert.fail("Expected StateTooLargeException"); + } catch (final StateTooLargeException stle) { + // expected behavior. + break; + } catch (final IOException ioe) { + // If we attempt to interact with the server too quickly, we will get a + // ZooKeeper ConnectionLoss Exception, which the provider wraps in an IOException. + // We will wait 1 second in this case and try again. The test will timeout if this + // does not succeeed within 20 seconds. + Thread.sleep(1000L); + } catch (final Exception e) { + e.printStackTrace(); + Assert.fail("Expected StateTooLargeException but " + e.getClass() + " was thrown", e); + } } } - @Test - @Ignore("Needs to be fixed as it intermittently fails.") - public void testStateTooLargeExceptionThrownOnReplace() throws IOException { + @Test(timeout = 20000) + public void testStateTooLargeExceptionThrownOnReplace() throws IOException, InterruptedException { final Map<String, String> state = new HashMap<>(); final StringBuilder sb = new StringBuilder(); @@ -163,7 +170,19 @@ public class TestZooKeeperStateProvider extends AbstractTestStateProvider { final Map<String, String> smallState = new HashMap<>(); smallState.put("abc", "xyz"); - getProvider().setState(smallState, componentId); + + while (true) { + try { + getProvider().setState(smallState, componentId); + break; + } catch (final IOException ioe) { + // If we attempt to interact with the server too quickly, we will get a + // ZooKeeper ConnectionLoss Exception, which the provider wraps in an IOException. + // We will wait 1 second in this case and try again. The test will timeout if this + // does not succeeed within 20 seconds. + Thread.sleep(1000L); + } + } try { getProvider().replace(getProvider().getState(componentId), state, componentId);
