Skip to content

Commit dacefb8

Browse files
authored
Reorder cleanup steps for YAML tests (#5729) (#5732)
(cherry picked from commit 6399e07)
1 parent d376690 commit dacefb8

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

tests/Tests.YamlRunner/TestSuiteBootstrap.fs

+3-5
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@ let DefaultSetup : Operation list = [Actions("Setup", fun (client, suite) ->
8686
let e = start.AddSeconds(30.)
8787
while (call() > 0 && DateTime.UtcNow < e) do ignore()
8888

89-
9089
let waitForPendingRollupTasks () = waitForPendingTasks "xpack/rollup/job"
91-
90+
9291
let deleteAllSLMPolicies () =
9392
getAndDelete
9493
(fun _ -> client.SnapshotLifecycleManagement.GetSnapshotLifecycle<DynamicResponse>())
@@ -233,12 +232,12 @@ let DefaultSetup : Operation list = [Actions("Setup", fun (client, suite) ->
233232
waitForPendingRollupTasks()
234233
yield! deleteAllSLMPolicies()
235234

236-
yield! wipeSnapshots()
237-
238235
if suite = Platinum then
239236
yield wipeDataStreams()
240237

241238
yield wipeAllIndices()
239+
240+
yield! wipeSnapshots()
242241

243242
yield! wipeTemplateForXPack()
244243

@@ -266,5 +265,4 @@ let DefaultSetup : Operation list = [Actions("Setup", fun (client, suite) ->
266265

267266
waitForClusterStateUpdatesToFinish()
268267
}
269-
270268
)]

0 commit comments

Comments
 (0)