You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2017/11/14 17:33:09 UTC
nifi-minifi git commit: MINIFI-409: Skipping failing tests on Windows.
Repository: nifi-minifi
Updated Branches:
refs/heads/master 120bf4e7d -> 7a8f1853c
MINIFI-409: Skipping failing tests on Windows.
This closes #97.
Signed-off-by: Aldrin Piri <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/7a8f1853
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/7a8f1853
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/7a8f1853
Branch: refs/heads/master
Commit: 7a8f1853c0b8147b3d249f23dd731bb27256be7b
Parents: 120bf4e
Author: jzonthemtn <jz...@apache.org>
Authored: Thu Nov 2 08:25:37 2017 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Tue Nov 14 12:31:46 2017 -0500
----------------------------------------------------------------------
.../provenance/MiNiFiPersistentProvenanceRepositoryTest.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7a8f1853/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/MiNiFiPersistentProvenanceRepositoryTest.java
----------------------------------------------------------------------
diff --git a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/MiNiFiPersistentProvenanceRepositoryTest.java b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/MiNiFiPersistentProvenanceRepositoryTest.java
index 780c691..264632c 100644
--- a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/MiNiFiPersistentProvenanceRepositoryTest.java
+++ b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/MiNiFiPersistentProvenanceRepositoryTest.java
@@ -66,6 +66,7 @@ import static org.apache.nifi.provenance.TestUtil.createFlowFile;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
import static org.mockito.Mockito.mock;
public class MiNiFiPersistentProvenanceRepositoryTest {
@@ -558,6 +559,7 @@ public class MiNiFiPersistentProvenanceRepositoryTest {
@Test
public void testMergeJournalsBadFirstRecord() throws IOException, InterruptedException {
+ assumeFalse(isWindowsEnvironment());//skip if on windows
final RepositoryConfiguration config = createConfiguration();
config.setMaxEventFileLife(3, TimeUnit.SECONDS);
TestableMiNiFiPersistentProvenanceRepository testRepo = new TestableMiNiFiPersistentProvenanceRepository(config, DEFAULT_ROLLOVER_MILLIS);
@@ -604,6 +606,7 @@ public class MiNiFiPersistentProvenanceRepositoryTest {
@Test
public void testMergeJournalsBadRecordAfterFirst() throws IOException, InterruptedException {
+ assumeFalse(isWindowsEnvironment());//skip if on windows
final RepositoryConfiguration config = createConfiguration();
config.setMaxEventFileLife(3, TimeUnit.SECONDS);
TestableMiNiFiPersistentProvenanceRepository testRepo = new TestableMiNiFiPersistentProvenanceRepository(config, DEFAULT_ROLLOVER_MILLIS);
@@ -650,6 +653,7 @@ public class MiNiFiPersistentProvenanceRepositoryTest {
@Test
public void testMergeJournalsEmptyJournal() throws IOException, InterruptedException {
+ assumeFalse(isWindowsEnvironment());//skip if on windows
final RepositoryConfiguration config = createConfiguration();
config.setMaxEventFileLife(3, TimeUnit.SECONDS);
TestableMiNiFiPersistentProvenanceRepository testRepo = new TestableMiNiFiPersistentProvenanceRepository(config, DEFAULT_ROLLOVER_MILLIS);
@@ -1010,4 +1014,8 @@ public class MiNiFiPersistentProvenanceRepositoryTest {
return configuration;
}
+ private boolean isWindowsEnvironment() {
+ return System.getProperty("os.name").toLowerCase().startsWith("windows");
+ }
+
}