This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new e71bb01cbf LOG4J2-3512, LOG4J2-3522 - Disable flaky tests
e71bb01cbf is described below
commit e71bb01cbf895aa1d3f7164802466aafe5995829
Author: Matt Sicker <[email protected]>
AuthorDate: Fri May 27 19:16:14 2022 -0500
LOG4J2-3512, LOG4J2-3522 - Disable flaky tests
Signed-off-by: Matt Sicker <[email protected]>
---
.../appender/rolling/RollingAppenderCountTest.java | 2 ++
.../filter/MutableThreadContextMapFilterTest.java | 23 +++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCountTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCountTest.java
index fd7c4081c8..49a83514d2 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCountTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCountTest.java
@@ -22,6 +22,7 @@ import org.apache.logging.log4j.junit.LoggerContextRule;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -38,6 +39,7 @@ import static org.junit.Assert.assertEquals;
/**
* Validate rolling with a file pattern that contains leading zeros for the
increment.
*/
+@Ignore("https://issues.apache.org/jira/browse/LOG4J2-3522")
public class RollingAppenderCountTest {
private static final String SOURCE = "src/test/resources/__files";
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilterTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilterTest.java
index ad3f0fdcd9..898fafa6d3 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilterTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilterTest.java
@@ -16,32 +16,31 @@
*/
package org.apache.logging.log4j.core.filter;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configurator;
import org.apache.logging.log4j.test.appender.ListAppender;
+import org.junit.Ignore;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.*;
/**
* Unit test for simple App.
*/
+@Ignore("https://issues.apache.org/jira/browse/LOG4J2-3512")
public class MutableThreadContextMapFilterTest implements
MutableThreadContextMapFilter.FilterConfigUpdateListener {
static final String CONFIG = "log4j2-mutableFilter.xml";