Repository: nifi Updated Branches: refs/heads/master fd5327e1b -> f0662a24e
NIFI-2092 Fixing unit tests which try to clean up directories before stopping the FlowController that has locks opened. This closes #568 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f0662a24 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f0662a24 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f0662a24 Branch: refs/heads/master Commit: f0662a24ef6ddd73eecf5393cb83718d38ae5cd5 Parents: fd5327e Author: jpercivall <joeperciv...@yahoo.com> Authored: Thu Jun 23 12:42:16 2016 -0400 Committer: jpercivall <joeperciv...@yahoo.com> Committed: Thu Jun 23 16:40:00 2016 -0400 ---------------------------------------------------------------------- .../apache/nifi/controller/scheduling/TestProcessorLifecycle.java | 2 +- .../test/java/org/apache/nifi/controller/MonitorMemoryTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f0662a24/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestProcessorLifecycle.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestProcessorLifecycle.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestProcessorLifecycle.java index 2aaa88a..16f4784 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestProcessorLifecycle.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestProcessorLifecycle.java @@ -91,9 +91,9 @@ public class TestProcessorLifecycle { @After public void after() throws Exception { + fc.shutdown(true); FileUtils.deleteDirectory(new File("./target/test-repo")); FileUtils.deleteDirectory(new File("./target/content_repository")); - fc.shutdown(true); } @Test http://git-wip-us.apache.org/repos/asf/nifi/blob/f0662a24/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java index 0970da4..7109537 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java @@ -51,9 +51,9 @@ public class MonitorMemoryTest { @After public void after() throws Exception { + fc.shutdown(true); FileUtils.deleteDirectory(new File("./target/test-repo")); FileUtils.deleteDirectory(new File("./target/content_repository")); - fc.shutdown(true); } @Test(expected = IllegalStateException.class)
