Skip to content

Commit a058acd

Browse files
remove all references to unused is_xpack variable
1 parent c8fae41 commit a058acd

File tree

1 file changed

+2
-25
lines changed

1 file changed

+2
-25
lines changed

test_elasticsearch/utils.py

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -118,38 +118,15 @@ def wipe_cluster(client):
118118
except ImportError:
119119
pass
120120

121-
is_xpack = False
122-
if is_xpack:
123-
wipe_rollup_jobs(client)
124-
wait_for_pending_tasks(client, filter="xpack/rollup/job")
125-
wipe_slm_policies(client)
126-
127-
# Searchable snapshot indices start in 7.8+
128-
if es_version(client) >= (7, 8):
129-
wipe_searchable_snapshot_indices(client)
130-
131121
wipe_snapshots(client)
132122
wipe_data_streams(client)
133123
wipe_indices(client)
134124

135-
if is_xpack:
136-
wipe_xpack_templates(client)
137-
else:
138-
client.indices.delete_template(name="*")
139-
client.indices.delete_index_template(name="*")
125+
client.indices.delete_template(name="*")
126+
client.indices.delete_index_template(name="*")
140127

141128
wipe_cluster_settings(client)
142129

143-
if is_xpack:
144-
wipe_ilm_policies(client)
145-
wipe_auto_follow_patterns(client)
146-
wipe_tasks(client)
147-
wipe_node_shutdown_metadata(client)
148-
wait_for_pending_datafeeds_and_jobs(client)
149-
wipe_calendars(client)
150-
wipe_filters(client)
151-
wipe_transforms(client)
152-
153130
wait_for_cluster_state_updates_to_finish(client)
154131
if close_after_wipe:
155132
client.close()

0 commit comments

Comments
 (0)