Skip to content

Commit bf5a40c

Browse files
authored
[ML] relax set upgrade mode test to match what is guaranteed (#41958) (#41979)
* [ML] relax set upgrade mode test to match what is guaranteed * removing unused import
1 parent 732ef15 commit bf5a40c

File tree

1 file changed

+5
-7
lines changed
  • x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration

1 file changed

+5
-7
lines changed

x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/SetUpgradeModeIT.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.Collections;
2626
import java.util.concurrent.TimeUnit;
2727

28+
import static org.elasticsearch.xpack.core.ml.MlTasks.AWAITING_UPGRADE;
2829
import static org.elasticsearch.xpack.ml.support.BaseMlIntegTestCase.createDatafeed;
2930
import static org.elasticsearch.xpack.ml.support.BaseMlIntegTestCase.createScheduledJob;
3031
import static org.elasticsearch.xpack.ml.support.BaseMlIntegTestCase.getDataCounts;
@@ -33,7 +34,6 @@
3334
import static org.hamcrest.Matchers.empty;
3435
import static org.hamcrest.Matchers.equalTo;
3536
import static org.hamcrest.Matchers.is;
36-
import static org.hamcrest.Matchers.isEmptyString;
3737
import static org.hamcrest.Matchers.not;
3838
import static org.hamcrest.Matchers.nullValue;
3939

@@ -88,12 +88,12 @@ public void testEnableUpgradeMode() throws Exception {
8888

8989
GetJobsStatsAction.Response.JobStats jobStats = getJobStats(jobId).get(0);
9090
assertThat(jobStats.getState(), equalTo(JobState.OPENED));
91-
assertThat(jobStats.getAssignmentExplanation(), equalTo(MlTasks.AWAITING_UPGRADE.getExplanation()));
91+
assertThat(jobStats.getAssignmentExplanation(), equalTo(AWAITING_UPGRADE.getExplanation()));
9292
assertThat(jobStats.getNode(), is(nullValue()));
9393

9494
GetDatafeedsStatsAction.Response.DatafeedStats datafeedStats = getDatafeedStats(datafeedId);
9595
assertThat(datafeedStats.getDatafeedState(), equalTo(DatafeedState.STARTED));
96-
assertThat(datafeedStats.getAssignmentExplanation(), equalTo(MlTasks.AWAITING_UPGRADE.getExplanation()));
96+
assertThat(datafeedStats.getAssignmentExplanation(), equalTo(AWAITING_UPGRADE.getExplanation()));
9797
assertThat(datafeedStats.getNode(), is(nullValue()));
9898

9999
Job.Builder job = createScheduledJob("job-should-not-open");
@@ -126,13 +126,11 @@ public void testEnableUpgradeMode() throws Exception {
126126

127127
jobStats = getJobStats(jobId).get(0);
128128
assertThat(jobStats.getState(), equalTo(JobState.OPENED));
129-
assertThat(jobStats.getAssignmentExplanation(), isEmptyString());
130-
assertThat(jobStats.getNode(), is(not(nullValue())));
129+
assertThat(jobStats.getAssignmentExplanation(), not(equalTo(AWAITING_UPGRADE.getExplanation())));
131130

132131
datafeedStats = getDatafeedStats(datafeedId);
133132
assertThat(datafeedStats.getDatafeedState(), equalTo(DatafeedState.STARTED));
134-
assertThat(datafeedStats.getAssignmentExplanation(), isEmptyString());
135-
assertThat(datafeedStats.getNode(), is(not(nullValue())));
133+
assertThat(datafeedStats.getAssignmentExplanation(), not(equalTo(AWAITING_UPGRADE.getExplanation())));
136134
}
137135

138136
private void startRealtime(String jobId) throws Exception {

0 commit comments

Comments
 (0)