honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix failing evil logger tests 

This commit fixes failing evil logger tests. The tests were failing
after inadvertently configuring appenders on the parent and child
logger.
This commit is contained in:
Jason Tedor 2016-08-30 18:35:08 -04:00
parent 0853fc806f
commit 9a58fc2348
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java
View File

@ -76,7 +76,7 @@ public class EvilLoggerTests extends ESTestCase {
} }
private void assertLogLine(final String logLine, final Level level, final String location, final String message) { private void assertLogLine(final String logLine, final Level level, final String location, final String message) {
final Matcher matcher = Pattern.compile("\\[(.*)\\]\\[(.*)\\(.*\\)\\] \\[\\] (.*)").matcher(logLine); final Matcher matcher = Pattern.compile("\\[(.*)\\]\\[(.*)\\(.*\\)\\] (.*)").matcher(logLine);
assertTrue(logLine, matcher.matches()); assertTrue(logLine, matcher.matches());
assertThat(matcher.group(1), equalTo(level.toString())); assertThat(matcher.group(1), equalTo(level.toString()));
assertThat(matcher.group(2), equalTo(location)); assertThat(matcher.group(2), equalTo(location));

2
qa/evil-tests/src/test/resources/org/elasticsearch/common/logging/config/log4j2.properties
View File

@ -17,8 +17,6 @@ rootLogger.appenderRef.file.ref = file
logger.test.name = test logger.test.name = test
logger.test.level = trace logger.test.level = trace
logger.test.appenderRef.console.ref = console
logger.test.appenderRef.file.ref = file
appender.deprecation_file.type = File appender.deprecation_file.type = File
appender.deprecation_file.name = deprecation_file appender.deprecation_file.name = deprecation_file