You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2022/07/25 21:34:10 UTC
[nifi] branch main updated: NIFI-10279: This closes #6246. Increased timeout in TestExecuteStateless, removed explicit timeouts on stateless system tests that were too aggressive so that the tests use the default 5 minute timeout defined in StatelessSystemIT
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 8a1249ee39 NIFI-10279: This closes #6246. Increased timeout in TestExecuteStateless, removed explicit timeouts on stateless system tests that were too aggressive so that the tests use the default 5 minute timeout defined in StatelessSystemIT
8a1249ee39 is described below
commit 8a1249ee3945b6a6c2cf7ea32542da0aab82ea0b
Author: Mark Payne <ma...@hotmail.com>
AuthorDate: Mon Jul 25 16:02:43 2022 -0400
NIFI-10279: This closes #6246. Increased timeout in TestExecuteStateless, removed explicit timeouts on stateless system tests that were too aggressive so that the tests use the default 5 minute timeout defined in StatelessSystemIT
Signed-off-by: Joe Witt <jo...@apache.org>
---
.../org/apache/nifi/processors/stateless/TestExecuteStateless.java | 3 +--
.../org/apache/nifi/stateless/basics/AsyncCommitCallbackIT.java | 7 ++-----
.../org/apache/nifi/stateless/basics/RollbackOnExceptionIT.java | 4 +---
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/src/test/java/org/apache/nifi/processors/stateless/TestExecuteStateless.java b/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/src/test/java/org/apache/nifi/processors/stateless/TestExecuteStateless.java
index 65b9d33269..9cfe05ddd5 100644
--- a/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/src/test/java/org/apache/nifi/processors/stateless/TestExecuteStateless.java
+++ b/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/src/test/java/org/apache/nifi/processors/stateless/TestExecuteStateless.java
@@ -88,7 +88,6 @@ public class TestExecuteStateless {
runner.assertAllFlowFilesTransferred(ExecuteStateless.REL_OUTPUT, 0);
}
-
@Test
public void testRouteToFailureWithInput() {
runner.setProperty(ExecuteStateless.DATAFLOW_FILE, "src/test/resources/route-to-desired-port.json");
@@ -99,7 +98,7 @@ public class TestExecuteStateless {
runner.enqueue("B", Collections.singletonMap("desired.port", "B"));
runner.enqueue("C", Collections.singletonMap("desired.port", "C"));
- runner.run(3, true, true, 60000L);
+ runner.run(3, true, true, 300_000L);
runner.assertTransferCount(ExecuteStateless.REL_OUTPUT, 3);
runner.assertTransferCount(ExecuteStateless.REL_ORIGINAL, 3);
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/AsyncCommitCallbackIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/AsyncCommitCallbackIT.java
index 9a1fefa7e7..2006a0ecd9 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/AsyncCommitCallbackIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/AsyncCommitCallbackIT.java
@@ -17,10 +17,10 @@
package org.apache.nifi.stateless.basics;
-import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.registry.flow.VersionedFlowSnapshot;
import org.apache.nifi.flow.VersionedPort;
import org.apache.nifi.flow.VersionedProcessor;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.registry.flow.VersionedFlowSnapshot;
import org.apache.nifi.stateless.StatelessSystemIT;
import org.apache.nifi.stateless.VersionedFlowBuilder;
import org.apache.nifi.stateless.config.StatelessConfigurationException;
@@ -29,7 +29,6 @@ import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
import java.io.File;
import java.io.IOException;
@@ -99,13 +98,11 @@ public class AsyncCommitCallbackIT extends StatelessSystemIT {
assertTrue(failureOutputFile.exists());
}
- @Timeout(10)
@Test
public void testCleanupAfterFlowFilesTerminated() throws IOException, StatelessConfigurationException, InterruptedException {
testCleanupAfterFlowFilesTerminated("asynchronous");
}
- @Timeout(10)
@Test
public void testSynchronousCommitCleanupAfterFlowFilesTerminated() throws IOException, StatelessConfigurationException, InterruptedException {
testCleanupAfterFlowFilesTerminated("synchronous");
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RollbackOnExceptionIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RollbackOnExceptionIT.java
index 4594b574eb..8105d8a3b8 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RollbackOnExceptionIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RollbackOnExceptionIT.java
@@ -17,9 +17,9 @@
package org.apache.nifi.stateless.basics;
-import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.flow.VersionedPort;
import org.apache.nifi.flow.VersionedProcessor;
+import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.stateless.StatelessSystemIT;
import org.apache.nifi.stateless.VersionedFlowBuilder;
import org.apache.nifi.stateless.config.StatelessConfigurationException;
@@ -28,7 +28,6 @@ import org.apache.nifi.stateless.flow.FailurePortEncounteredException;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
import java.io.IOException;
import java.util.Collections;
@@ -39,7 +38,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class RollbackOnExceptionIT extends StatelessSystemIT {
private static final String EXCEPTION_TEXT = "Intentional Exception to verify behavior in RollbackOnExceptionIT";
- @Timeout(30)
@Test
public void testFlowFileCompletelyRemovedWhenExceptionThrown() throws IOException, StatelessConfigurationException, InterruptedException {
final VersionedFlowBuilder builder = new VersionedFlowBuilder();