From f0662a24ef6ddd73eecf5393cb83718d38ae5cd5 Mon Sep 17 00:00:00 2001 From: jpercivall Date: Thu, 23 Jun 2016 12:42:16 -0400 Subject: [PATCH] NIFI-2092 Fixing unit tests which try to clean up directories before stopping the FlowController that has locks opened. This closes #568 --- .../nifi/controller/scheduling/TestProcessorLifecycle.java | 2 +- .../test/java/org/apache/nifi/controller/MonitorMemoryTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 2aaa88a934..16f47845d1 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 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 0970da4954..7109537953 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)