From 222b9ab774b10b619f8a3891b9fc9f8413ff393b Mon Sep 17 00:00:00 2001 From: Lorand Jakab Date: Fri, 8 Jun 2018 12:18:25 +0200 Subject: [PATCH] Fix integrationtest log levels The TRACE level Karaf logging configuration for lispflowmapping no longer works. Use an alternative, more realiable and independent way of configuring it. Change-Id: Idf91b7abf4c295d52d63f117e28e7a30b6332e09 Signed-off-by: Lorand Jakab --- .../MappingServiceIntegrationTest.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java index d53205aa6..8365f3f44 100644 --- a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java +++ b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java @@ -28,7 +28,6 @@ import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenario import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D_WP_100_1_SB; import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D_WP_50_2_SB; import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_E_SB; -import static org.ops4j.pax.exam.CoreOptions.composite; import static org.ops4j.pax.exam.CoreOptions.maven; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; @@ -199,23 +198,17 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { return "odl-lispflowmapping-msmr"; } - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - "log4j2.logger.lispflowmapping.name", - "org.opendaylight.lispflowmapping"); - option = composite(option, editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - "log4j2.logger.lispflowmapping.level", - LogLevel.TRACE.name())); - option = composite(option, super.getLoggingOption()); - return option; - } - @Override protected Option[] getAdditionalOptions() { return new Option[] { keepRuntimeFolder(), - configureConsole().ignoreLocalConsole().ignoreRemoteShell() + configureConsole().ignoreLocalConsole().ignoreRemoteShell(), + editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, + "log4j2.logger.lispflowmapping.name", + "org.opendaylight.lispflowmapping"), + editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, + "log4j2.logger.lispflowmapping.level", + LogLevel.TRACE.name()) }; } -- 2.36.6