You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2021/08/24 15:38:31 UTC

[nifi] branch main updated: NIFI-9073 - Limit Surefire Output during Build

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 aa5babb  NIFI-9073 - Limit Surefire Output during Build
aa5babb is described below

commit aa5babbb9738bd3737a65e1678e064bd159fe95c
Author: Paul Grey <gr...@yahoo.com>
AuthorDate: Sat Aug 21 19:21:20 2021 -0400

    NIFI-9073 - Limit Surefire Output during Build
    
    This closes #5325
    
    Signed-off-by: David Handermann <ex...@apache.org>
---
 .../src/test/resources/logback-test.xml                      |  2 +-
 .../crypto/EncryptedFileSystemRepositoryTest.groovy          |  3 +--
 .../apache/nifi/controller/TestStandardFlowFileQueue.java    |  2 +-
 .../src/test/resources/logback-test.xml                      | 12 ------------
 .../src/test/resources/log4j.properties                      |  2 +-
 5 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/nifi-commons/nifi-site-to-site-client/src/test/resources/logback-test.xml b/nifi-commons/nifi-site-to-site-client/src/test/resources/logback-test.xml
index 9e235bd..055cf3f 100644
--- a/nifi-commons/nifi-site-to-site-client/src/test/resources/logback-test.xml
+++ b/nifi-commons/nifi-site-to-site-client/src/test/resources/logback-test.xml
@@ -30,7 +30,7 @@
 
 
     <logger name="org.apache.nifi" level="INFO"/>
-    <logger name="org.apache.nifi.remote.client" level="DEBUG"/>
+    <logger name="org.apache.nifi.remote.client" level="INFO"/>
     <logger name="org.apache.nifi.remote.client.PeerSelectorTest" level="DEBUG"/>
 
     <root level="INFO">
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/controller/repository/crypto/EncryptedFileSystemRepositoryTest.groovy b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/controller/repository/crypto/EncryptedFileSystemRepositoryTest.groovy
index 7425f33..fd0185d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/controller/repository/crypto/EncryptedFileSystemRepositoryTest.groovy
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/controller/repository/crypto/EncryptedFileSystemRepositoryTest.groovy
@@ -97,12 +97,11 @@ class EncryptedFileSystemRepositoryTest {
     static void setUpOnce() throws Exception {
         Assume.assumeTrue("Test only runs on *nix", !SystemUtils.IS_OS_WINDOWS)
         ORIGINAL_LOG_LEVEL = System.getProperty(LOG_PACKAGE)
-        System.setProperty(LOG_PACKAGE, "DEBUG")
 
         Security.addProvider(new BouncyCastleProvider())
 
         logger.metaClass.methodMissing = { String name, args ->
-            logger.info("[${name?.toUpperCase()}] ${(args as List).join(" ")}")
+            logger.debug("[${name?.toUpperCase()}] ${(args as List).join(" ")}")
         }
 
         mockCipherProvider = [
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
index b94629a..e20d7fb 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
@@ -72,7 +72,7 @@ public class TestStandardFlowFileQueue {
 
     @BeforeClass
     public static void setupLogging() {
-        System.setProperty("org.slf4j.simpleLogger.log.org.apache.nifi", "DEBUG");
+        System.setProperty("org.slf4j.simpleLogger.log.org.apache.nifi", "INFO");
     }
 
     @Before
diff --git a/nifi-commons/nifi-site-to-site-client/src/test/resources/logback-test.xml b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/resources/logback-test.xml
similarity index 70%
copy from nifi-commons/nifi-site-to-site-client/src/test/resources/logback-test.xml
copy to nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/resources/logback-test.xml
index 9e235bd..86408f1 100644
--- a/nifi-commons/nifi-site-to-site-client/src/test/resources/logback-test.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/resources/logback-test.xml
@@ -21,18 +21,6 @@
         </encoder>
     </appender>
 
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>./target/log</file>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%date %level [%thread] %logger{40} %msg%n</pattern>
-        </encoder>
-    </appender>
-
-
-    <logger name="org.apache.nifi" level="INFO"/>
-    <logger name="org.apache.nifi.remote.client" level="DEBUG"/>
-    <logger name="org.apache.nifi.remote.client.PeerSelectorTest" level="DEBUG"/>
-
     <root level="INFO">
         <appender-ref ref="CONSOLE"/>
     </root>
diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/log4j.properties b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/log4j.properties
index d68cca0..69e4f09 100644
--- a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/log4j.properties
+++ b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/log4j.properties
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-log4j.rootLogger=DEBUG,console,test
+log4j.rootLogger=INFO,console,test
 
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.Target=System.err