Skip to content

Commit 6399e07

Browse files
authored
Reorder cleanup steps for YAML tests (#5729)
1 parent d9958cf commit 6399e07

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

tests/Tests.YamlRunner/TestSuiteBootstrap.fs

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

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

235-
yield! wipeSnapshots()
236-
237234
if suite = Platinum then
238235
yield wipeDataStreams()
239236

240237
yield wipeAllIndices()
238+
239+
yield! wipeSnapshots()
241240

242241
yield! wipeTemplateForXPack()
243242

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

266265
waitForClusterStateUpdatesToFinish()
267266
}
268-
269267
)]

0 commit comments

Comments
 (0)