[CI] Test Runner: Pass in admin_client to test_file

Author: picandocodigo

api-spec-testing/test_file.rb

@@ -39,6 +39,7 @@ class TestFile
       #   TestFile.new(file_name)
       #
       # @param [ String ] file_name The name of the test file.
+      # @param [ Client] An instance of the client
       # @param [ Array<Symbol> ] skip_features The names of features to skip.
       #
       # @since 6.1.0
@@ -105,14 +106,14 @@ def tests
       # Run the setup tasks defined for a single test file.
       #
       # @example Run the setup tasks.
-      #   test_file.setup(client)
+      #   test_file.setup
       #
       # @param [ Elasticsearch::Client ] client The client to use to perform the setup tasks.
       #
       # @return [ self ]
       #
       # @since 6.2.0
-      def setup(client)
+      def setup
         return unless @setup
 
         actions = @setup['setup'].select { |action| action['do'] }.map { |action| Action.new(action['do']) }
@@ -147,14 +148,14 @@ def setup(client)
       # Run the teardown tasks defined for a single test file.
       #
       # @example Run the teardown tasks.
-      #   test_file.teardown(client)
+      #   test_file.teardown
       #
       # @param [ Elasticsearch::Client ] client The client to use to perform the teardown tasks.
       #
       # @return [ self ]
       #
       # @since 6.2.0
-      def teardown(client)
+      def teardown
         return unless @teardown
 
         actions = @teardown['teardown'].select { |action| action['do'] }.map { |action| Action.new(action['do']) }

elasticsearch-api/spec/elasticsearch/api/rest_api_yaml_spec.rb

@@ -9,7 +9,7 @@
   # Traverse YAML files and create TestFile object:
   REST_API_YAML_FILES.each do |file|
     begin
-      test_file = Elasticsearch::RestAPIYAMLTests::TestFile.new(file, REST_API_YAML_SKIP_FEATURES)
+      test_file = Elasticsearch::RestAPIYAMLTests::TestFile.new(file, ADMIN_CLIENT, REST_API_YAML_SKIP_FEATURES)
     rescue SkipTestsException => _e
       # If the test file has a `skip` at the top level that applies to this
       # version of Elasticsearch, continue with the next text.
@@ -29,11 +29,11 @@
             # Runs once before each test in a test file
             before(:all) do
               Elasticsearch::RestAPIYAMLTests::TestFile.wipe_cluster(ADMIN_CLIENT)
-              test_file.setup(ADMIN_CLIENT)
+              test_file.setup
             end
 
             after(:all) do
-              test_file.teardown(ADMIN_CLIENT)
+              test_file.teardown
               Elasticsearch::RestAPIYAMLTests::TestFile.wipe_cluster(ADMIN_CLIENT)
             end
 

elasticsearch-xpack/spec/xpack/rest_api_yaml_spec.rb

@@ -21,7 +21,7 @@
 describe 'XPack Rest API YAML tests' do
   REST_API_YAML_FILES.each do |file|
     begin
-      test_file = Elasticsearch::RestAPIYAMLTests::TestFile.new(file, DEFAULT_CLIENT, REST_API_YAML_SKIP_FEATURES)
+      test_file = Elasticsearch::RestAPIYAMLTests::TestFile.new(file, ADMIN_CLIENT, REST_API_YAML_SKIP_FEATURES)
     rescue SkipTestsException => _e
       # If the test file has a `skip` at the top level that applies to this
       # version of Elasticsearch, continue with the next text.
@@ -55,11 +55,11 @@
               ADMIN_CLIENT.cluster.put_settings(body: { transient: { "xpack.ml.max_model_memory_limit" => nil } })
               ADMIN_CLIENT.cluster.put_settings(body: { persistent: { "xpack.ml.max_model_memory_limit" => nil } })
               Elasticsearch::RestAPIYAMLTests::TestFile.wipe_cluster(ADMIN_CLIENT)
-              test_file.setup(ADMIN_CLIENT)
+              test_file.setup
             end
 
             after(:all) do
-              test_file.teardown(ADMIN_CLIENT)
+              test_file.teardown
             end
 
             test.task_groups.each do |task_group|