From 2f0047cec35ca8e7ba13bedec41129346f2533b4 Mon Sep 17 00:00:00 2001 From: Konrad Windszus Date: Tue, 11 Jan 2022 22:09:38 +0100 Subject: [PATCH] Skip unstable test ThrottedTaskRunnerTest.testExecutionOrder() on Mac OS (#2768) This closes #2767 --- CHANGELOG.md | 1 + .../adobe/acs/commons/fam/impl/ThrottledTaskRunnerTest.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b75df1882b..775e9b492e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com) ### Changed +- #2767 - ThrottledTaskRunnerTest.testExecutionOrder unstable on Mac OS - #2261 - Update to latest mocking libraries - #2753 - Update to AEM 6.4 dependencies - #2754 - Support building with Java 17 diff --git a/bundle/src/test/java/com/adobe/acs/commons/fam/impl/ThrottledTaskRunnerTest.java b/bundle/src/test/java/com/adobe/acs/commons/fam/impl/ThrottledTaskRunnerTest.java index 895a5d6077..0b24f9bdae 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/fam/impl/ThrottledTaskRunnerTest.java +++ b/bundle/src/test/java/com/adobe/acs/commons/fam/impl/ThrottledTaskRunnerTest.java @@ -24,6 +24,8 @@ import java.util.Collections; import java.util.List; import javax.management.NotCompliantMBeanException; + +import org.apache.commons.lang3.SystemUtils; import org.apache.sling.testing.mock.osgi.junit.OsgiContext; import org.junit.Rule; import org.junit.Test; @@ -31,6 +33,7 @@ import org.slf4j.LoggerFactory; import static org.junit.Assert.assertEquals; +import static org.junit.Assume.assumeFalse; public class ThrottledTaskRunnerTest { @@ -41,6 +44,7 @@ public class ThrottledTaskRunnerTest { @Test public void testExecutionOrderOverflow() throws NotCompliantMBeanException, InterruptedException { + assumeFalse("Test unstable on Mac OS, skipping execution on that OS!", SystemUtils.IS_OS_MAC); ThrottledTaskRunner ttr = osgiContext.registerService(new ThrottledTaskRunnerImpl()); List executions = Collections.synchronizedList(new ArrayList<>());