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 <joewitt@apache.org>
This commit is contained in:
Mark Payne 2022-07-25 16:02:43 -04:00 committed by Joe Witt
parent adf8b0d359
commit 8a1249ee39
No known key found for this signature in database
GPG Key ID: 9093BF854F811A1A
3 changed files with 4 additions and 10 deletions

View File

@ -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);

View File

@ -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");

View File

@ -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();