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

Logging: Fix test on windows 

Windows' `\` instead of `/` strikes again!

Closes #32546
This commit is contained in:
Nik Everett 2018-08-09 14:35:30 -04:00
parent 9a16491ebf
commit abda9fdac1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.appender.CountingNoOpAppender; import org.apache.logging.log4j.core.appender.CountingNoOpAppender;
import org.apache.logging.log4j.core.config.Configurator; import org.apache.logging.log4j.core.config.Configurator;
import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.lucene.util.Constants;
import org.elasticsearch.cli.UserException; import org.elasticsearch.cli.UserException;
import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.common.Randomness; import org.elasticsearch.common.Randomness;
@ -360,7 +361,6 @@ public class EvilLoggerTests extends ESTestCase {
} }
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/32546")
public void testNoNodeNameWarning() throws IOException, UserException { public void testNoNodeNameWarning() throws IOException, UserException {
setupLogging("no_node_name"); setupLogging("no_node_name");
@ -376,8 +376,12 @@ public class EvilLoggerTests extends ESTestCase {
+ "have %node_name. We will automatically add %node_name to the pattern to ease the migration for users " + "have %node_name. We will automatically add %node_name to the pattern to ease the migration for users "
+ "who customize log4j2.properties but will stop this behavior in 7.0. You should manually replace " + "who customize log4j2.properties but will stop this behavior in 7.0. You should manually replace "
+ "`%node_name` with `\\[%node_name\\]%marker ` in these locations:"); + "`%node_name` with `\\[%node_name\\]%marker ` in these locations:");
if (Constants.WINDOWS) {
assertThat(events.get(1), endsWith("no_node_name\\log4j2.properties"));
} else {
assertThat(events.get(1), endsWith("no_node_name/log4j2.properties")); assertThat(events.get(1), endsWith("no_node_name/log4j2.properties"));
} }
}
private void setupLogging(final String config) throws IOException, UserException { private void setupLogging(final String config) throws IOException, UserException {
setupLogging(config, Settings.EMPTY); setupLogging(config, Settings.EMPTY);