This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 4cd63c9 NIFI-7205 NIFI-7206
4cd63c9 is described below
commit 4cd63c99e8f412650caa2f3b775a9647f6414a98
Author: Joe Witt <[email protected]>
AuthorDate: Wed Feb 26 11:55:21 2020 -0800
NIFI-7205 NIFI-7206
Signed-off-by: Pierre Villard <[email protected]>
This closes #4093.
---
.../state/providers/zookeeper/TestZooKeeperStateProvider.java | 10 +++++-----
.../standard/relp/handler/TestRELPSocketChannelHandler.java | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
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 091b13c..cac0cf9 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
@@ -45,7 +45,7 @@ public class TestZooKeeperStateProvider extends
AbstractTestStateProvider {
private static final Map<PropertyDescriptor, String> defaultProperties =
new HashMap<>();
static {
- defaultProperties.put(ZooKeeperStateProvider.SESSION_TIMEOUT, "3
secs");
+ defaultProperties.put(ZooKeeperStateProvider.SESSION_TIMEOUT, "15
secs");
defaultProperties.put(ZooKeeperStateProvider.ROOT_NODE,
"/nifi/team1/testing");
defaultProperties.put(ZooKeeperStateProvider.ACCESS_CONTROL,
ZooKeeperStateProvider.OPEN_TO_WORLD.getValue());
}
@@ -131,7 +131,7 @@ public class TestZooKeeperStateProvider extends
AbstractTestStateProvider {
return provider;
}
- @Test(timeout = 20000)
+ @Test(timeout = 30000)
public void testStateTooLargeExceptionThrownOnSetState() throws
InterruptedException {
final Map<String, String> state = new HashMap<>();
final StringBuilder sb = new StringBuilder();
@@ -157,7 +157,7 @@ public class TestZooKeeperStateProvider extends
AbstractTestStateProvider {
// 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.
+ // does not succeeed within 30 seconds.
Thread.sleep(1000L);
} catch (final Exception e) {
e.printStackTrace();
@@ -166,7 +166,7 @@ public class TestZooKeeperStateProvider extends
AbstractTestStateProvider {
}
}
- @Test(timeout = 20000)
+ @Test(timeout = 30000)
public void testStateTooLargeExceptionThrownOnReplace() throws
IOException, InterruptedException {
final Map<String, String> state = new HashMap<>();
final StringBuilder sb = new StringBuilder();
@@ -192,7 +192,7 @@ public class TestZooKeeperStateProvider extends
AbstractTestStateProvider {
// 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.
+ // does not succeeed within 30 seconds.
Thread.sleep(1000L);
}
}
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPSocketChannelHandler.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPSocketChannelHandler.java
index 4ac1fb7..5bfaca7 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPSocketChannelHandler.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPSocketChannelHandler.java
@@ -153,8 +153,8 @@ public class TestRELPSocketChannelHandler {
}
}
- // wait up to 10 seconds to verify the responses
- long timeout = 10000;
+ // wait up to 25 seconds to verify the responses
+ long timeout = 25000;
long startTime = System.currentTimeMillis();
while (events.size() < messages.size() &&
(System.currentTimeMillis() - startTime < timeout)) {
Thread.sleep(100);
