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 2019/04/08 19:07:01 UTC
[nifi] branch master updated: NIFI-6184: This closes #3413. Removed
unnecessary test-jar dep from nifi-livy-processors causing race condition,
added assertion to catch failures
This is an automated email from the ASF dual-hosted git repository.
joewitt 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 8572852 NIFI-6184: This closes #3413. Removed unnecessary test-jar dep from nifi-livy-processors causing race condition, added assertion to catch failures
8572852 is described below
commit 8572852bdfb96995e66ead9c5f01ae259d2f96b0
Author: Matthew Burgess <ma...@apache.org>
AuthorDate: Fri Apr 5 22:45:34 2019 -0400
NIFI-6184: This closes #3413. Removed unnecessary test-jar dep from nifi-livy-processors causing race condition, added assertion to catch failures
Signed-off-by: Joe Witt <jo...@apache.org>
---
nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml | 7 -------
.../nifi/processors/livy/ExecuteSparkInteractiveTestBase.java | 1 +
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml
index a38d87b..a1cab03 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml
@@ -75,13 +75,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-standard-processors</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/java/org/apache/nifi/processors/livy/ExecuteSparkInteractiveTestBase.java b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/java/org/apache/nifi/processors/livy/ExecuteSparkInteractiveTestBase.java
index f0076e7..18fbdeb 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/java/org/apache/nifi/processors/livy/ExecuteSparkInteractiveTestBase.java
+++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/java/org/apache/nifi/processors/livy/ExecuteSparkInteractiveTestBase.java
@@ -112,6 +112,7 @@ class ExecuteSparkInteractiveTestBase {
runner.run();
List<MockFlowFile> waitingFlowfiles = runner.getFlowFilesForRelationship(ExecuteSparkInteractive.REL_WAIT);
while (!waitingFlowfiles.isEmpty()) {
+ runner.assertTransferCount(ExecuteSparkInteractive.REL_FAILURE, 0);
Thread.sleep(1000);
runner.clearTransferState();
runner.enqueue(code);