From c74b6d22270c6f7ec953c807f3d7a14da9bd474a Mon Sep 17 00:00:00 2001
From: Valeriy Khakhutskyy <1292899+valeriy42@users.noreply.github.com>
Date: Fri, 26 Jul 2024 16:07:54 +0200
Subject: [PATCH 1/2] Fix failing test condition

---
 .../xpack/core/ml/job/config/DetectionRuleTests.java            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRuleTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRuleTests.java
index d716f34f86e6c..127088d82bade 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRuleTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRuleTests.java
@@ -139,6 +139,8 @@ protected DetectionRule mutateInstance(DetectionRule instance) {
 
         if (actions.contains(RuleAction.FORCE_TIME_SHIFT) && params.getForceTimeShift() == null) {
             params = new RuleParams(new RuleParamsForForceTimeShift(randomLong()));
+        } else if (actions.contains(RuleAction.FORCE_TIME_SHIFT) == false && params.getForceTimeShift() != null) {
+            params = new RuleParams();
         }
 
         return new DetectionRule.Builder(conditions).setActions(actions).setScope(scope).setParams(params).build();

From 214842da39ad06d266c454c5208d822a72c6886c Mon Sep 17 00:00:00 2001
From: Valeriy Khakhutskyy <1292899+valeriy42@users.noreply.github.com>
Date: Fri, 26 Jul 2024 16:59:33 +0200
Subject: [PATCH 2/2] remove fixed test from the list

---
 muted-tests.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index b251972e2c9fd..aeafd5c38e250 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -117,9 +117,6 @@ tests:
 - class: org.elasticsearch.upgrades.LogsIndexModeFullClusterRestartIT
   method: testLogsIndexing {cluster=UPGRADED}
   issue: https://github.com/elastic/elasticsearch/issues/111306
-- class: org.elasticsearch.xpack.core.ml.job.config.DetectionRuleTests
-  method: testEqualsAndHashcode
-  issue: https://github.com/elastic/elasticsearch/issues/111308
 - class: org.elasticsearch.compute.lucene.LuceneQueryExpressionEvaluatorTests
   method: testTermsQueryShuffled
   issue: https://github.com/elastic/elasticsearch/issues/111318