Repository: nifi Updated Branches: refs/heads/0.x 7b7788ef7 -> 6e7b67e84
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/6e7b67e8 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6e7b67e8 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6e7b67e8 Branch: refs/heads/0.x Commit: 6e7b67e8480d5c2772eac90a4a8aae32704b5fb0 Parents: 7b7788e Author: jpercivall <joeperciv...@yahoo.com> Authored: Thu Jun 23 12:42:16 2016 -0400 Committer: Oleg Zhurakousky <o...@suitcase.io> Committed: Thu Jun 23 14:19:02 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/6e7b67e8/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 df52516..f0756a8 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 @@ -90,9 +90,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/6e7b67e8/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 b81d952..54f6aab 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)
