This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 05adcbc NIFI-9181 Prevent unwanted test artifacts in Windows builds
05adcbc is described below
commit 05adcbcc615bc204120d9e5cfa613b4ac5450872
Author: Chris Sampson <[email protected]>
AuthorDate: Mon Aug 30 21:37:49 2021 +0100
NIFI-9181 Prevent unwanted test artifacts in Windows builds
This closes #5355
Signed-off-by: David Handermann <[email protected]>
---
.../apache/nifi/controller/state/server/TestZooKeeperStateServer.java | 2 +-
.../org/apache/nifi/processors/groovyx/ExecuteGroovyScriptTest.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/state/server/TestZooKeeperStateServer.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
index ff12c7e..78e735c 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
@@ -49,7 +49,7 @@ public class TestZooKeeperStateServer {
@BeforeClass
public static void setup() throws IOException, ConfigException {
- tempDir = Paths.get("target/TestZooKeeperStateServer");
+ tempDir = Paths.get("target", "TestZooKeeperStateServer");
dataDir = tempDir.resolve("state");
zkServerConfig = tempDir.resolve("zookeeper.properties");
clientPort = InstanceSpec.getRandomPort();
diff --git
a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/test/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScriptTest.java
b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/test/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScriptTest.java
index 473a480..32cb6a6 100644
---
a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/test/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScriptTest.java
+++
b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/test/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScriptTest.java
@@ -105,7 +105,7 @@ public class ExecuteGroovyScriptTest {
Assume.assumeTrue("Test only runs on *nix",
!SystemUtils.IS_OS_WINDOWS);
FileUtils.copyDirectory(new File("src/test/resources"), new
File("target/test/resources"));
//prepare database connection
- System.setProperty("derby.stream.error.file", "target/derby.log");
+ System.setProperty("derby.stream.error.file", "target" +
File.separator + "derby.log");
// remove previous test database, if any
final File dbLocation = new File(DB_LOCATION);
