[ML] Fix failing test DetectionRulesTests.testEqualsAndHashcode (elas…

…tic#111351) Fixes elastic#111308
pickypg · Jul 29, 2024 · 80d539d · 80d539d
1 parent 1a939e9
commit 80d539d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -108,9 +108,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.xpack.ml.integration.DatafeedJobsRestIT
   issue: https://github.com/elastic/elasticsearch/issues/111319
 - class: org.elasticsearch.xpack.esql.analysis.VerifierTests

diff --git a/...gin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRuleTests.java b/...gin/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();