Skip to content

Commit a3d0c2c

Browse files
committed
Fix test assertion
clusterstate configs may be null
1 parent c0d7614 commit a3d0c2c

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/MlMigrationFullClusterRestartIT.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,18 +202,20 @@ private void waitForMigration(List<String> expectedMigratedJobs, List<String> ex
202202

203203
List<Map<String, Object>> jobs =
204204
(List<Map<String, Object>>) XContentMapValues.extractValue("metadata.ml.jobs", responseMap);
205-
assertNotNull(jobs);
206205

207-
for (String jobId : expectedMigratedJobs) {
208-
assertJobNotPresent(jobId, jobs);
206+
if (jobs != null) {
207+
for (String jobId : expectedMigratedJobs) {
208+
assertJobNotPresent(jobId, jobs);
209+
}
209210
}
210211

211212
List<Map<String, Object>> datafeeds =
212213
(List<Map<String, Object>>) XContentMapValues.extractValue("metadata.ml.datafeeds", responseMap);
213-
assertNotNull(datafeeds);
214214

215-
for (String datafeedId : expectedMigratedDatafeeds) {
216-
assertDatafeedNotPresent(datafeedId, datafeeds);
215+
if (datafeeds != null) {
216+
for (String datafeedId : expectedMigratedDatafeeds) {
217+
assertDatafeedNotPresent(datafeedId, datafeeds);
218+
}
217219
}
218220
}, 30, TimeUnit.SECONDS);
219221
}

0 commit comments

Comments
 (0)