[X-Pack] Specific cleanup for x-pack

Author: picandocodigo

api-spec-testing/test_file.rb

@@ -111,8 +111,9 @@ def clear_data_xpack(client)
           clear_rollup_jobs(client)
           clear_tasks(client)
           clear_machine_learning_indices(client)
-          create_x_pack_rest_user(client)
-          clear_data(client)
+          clear_indices_xpack(client)
+          clear_index_templates(client)
+          clear_snapshots_and_repositories(client)
           clear_transforms(client)
         end
 
@@ -197,6 +198,16 @@ def clear_transforms(client)
         def clear_indices(client)
           client.indices.delete(index: '*')
         end
+
+        def clear_indices_xpack(client)
+          indices = client.indices.get(index: '_all').keys.reject do |i|
+            i.start_with?('.security') || i.start_with?('.watches')
+          end
+          indices.each do |index|
+            client.indices.delete_alias(index: index, name: '*', ignore: 404)
+            client.indices.delete(index: index, ignore: 404)
+          end
+        end
       end
     end
   end

elasticsearch-xpack/spec/xpack/rest_api_yaml_spec.rb

@@ -12,19 +12,15 @@
     test_file = Elasticsearch::RestAPIYAMLTests::TestFile.new(file, REST_API_YAML_SKIP_FEATURES)
 
     context "#{file.gsub("#{YAML_FILES_DIRECTORY}/", '')}" do
-
       before(:all) do
         # Runs once before all tests in a test file
         Elasticsearch::RestAPIYAMLTests::TestFile.clear_data_xpack(ADMIN_CLIENT)
       end
 
       test_file.tests.each do |test|
-
         context "#{test.description}" do
-
           if test.skip_test?(ADMIN_CLIENT)
             skip 'Test contains feature(s) not yet supported or version is not satisfied'
-
           else
 
             let(:client) do