home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-25 12:46:21 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1516 from minwoo-jung/master

Browse Source 
[#NoIssue] fix test fail
This commit is contained in:
Minwoo Jung
2016-02-03 14:18:37 +09:00
parent 7b6c0f8e97 6d7e64a281
commit 829460c1fa
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent/src/test/java/com/navercorp/pinpoint/plugin/log4j/Log4jIT.java
+2
View File
@@ -22,10 +22,12 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import com.navercorp.pinpoint.test.plugin.Dependency;
import com.navercorp.pinpoint.test.plugin.PinpointConfig;
import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite;
@RunWith(PinpointPluginTestSuite.class)
@Dependency({"log4j:log4j:[1.2.16,)"})
@PinpointConfig("pinpoint-spring-bean-test.config")
public class Log4jIT {
@Test
agent/src/test/java/com/navercorp/pinpoint/plugin/logback/LogbackIT.java
+2
View File
@@ -23,10 +23,12 @@ import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import com.navercorp.pinpoint.test.plugin.Dependency;
import com.navercorp.pinpoint.test.plugin.PinpointConfig;
import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite;
@RunWith(PinpointPluginTestSuite.class)
@Dependency({"ch.qos.logback:logback-classic:[1.0.13],[1.1.3,)", "org.slf4j:slf4j-api:1.7.12"})
@PinpointConfig("pinpoint-spring-bean-test.config")
public class LogbackIT {
@Test
agent/src/test/resources/pinpoint-spring-bean-test.config
+2 -2
View File
@@ -202,9 +202,9 @@ profiler.spring.beans.mark.error=false
###########################################################
# log4j
###########################################################
profiler.log4j.logging.transactioninfo=false
profiler.log4j.logging.transactioninfo=true
###########################################################
# logback
###########################################################
profiler.logback.logging.transactioninfo=false
profiler.logback.logging.transactioninfo=true