hybrid_platforms_conductor 33.0.0 → 33.0.1

data/spec/hybrid_platforms_conductor_test/api/platform_handlers/serverless_chef/inventory_spec.rb

@@ -1,6 +1,6 @@
 describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef do
 
-  context 'checking inventory' do
+  context 'when checking inventory' do
 
     context 'with an empty platform' do
 
@@ -38,10 +38,10 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
             description: 'Single test node',
             image: 'debian_9',
             private_ips: ['172.16.0.1'],
-            property1: {
-              'property11' => 'value11'
+            property_1: {
+              'property_11' => 'value11'
             },
-            property2: 'value2'
+            property_2: 'value2'
           )
         end
       end

data/spec/hybrid_platforms_conductor_test/api/platform_handlers/serverless_chef/packaging_spec.rb

@@ -1,6 +1,6 @@
 describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef do
 
-  context 'checking services packaging' do
+  context 'when checking services packaging' do
 
     # Expect a repository to be packaged and mock it
     #
@@ -12,7 +12,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
     # * *export* (Boolean): Are we expecting the chef export stage? [default: true]
     # * *data_bags* (Boolean): Do we expect data bags copy? [default: false]
     # * *env* (String): Expected environment being packaged [default: 'prod']
-    # * Proc: Code called with mock in place
+    # * *block* (Proc): Code called with mock in place
     def with_packaging_mocked(
       repository,
       policy: 'test_policy',
@@ -20,7 +20,8 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
       install: true,
       export: true,
       data_bags: false,
-      env: 'prod'
+      env: 'prod',
+      &block
     )
       with_cmd_runner_mocked(
         if install
@@ -29,11 +30,11 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
               "cd #{repository} && /opt/chef-workstation/bin/chef install #{policy_file} --chef-license accept",
               proc do
                 # Mock the run_list stored in the lock file
+                dsl_parser = HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef::DslParser.new
+                dsl_parser.parse("#{repository}/#{policy_file}")
                 File.write(
                   "#{repository}/#{policy_file.gsub(/.rb$/, '.lock.json')}",
-                  {
-                    run_list: eval("[#{File.read("#{repository}/#{policy_file}").split("\n").select { |line| line =~ /^run_list.+$/ }.last.match(/^run_list(.+)$/)[1]}]").flatten
-                  }.to_json
+                  { run_list: dsl_parser.calls.select { |call| call[:method] == :run_list }.last[:args].flatten }.to_json
                 )
                 [0, 'Chef install done', '']
               end
@@ -46,7 +47,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
           [
             ['whoami', proc { [0, 'test_user', ''] }, { optional: true }],
             [
-              /^cd #{Regexp.escape(repository)} &&\s+sudo rm -rf dist\/#{Regexp.escape(env)}\/#{Regexp.escape(policy)} &&\s+\/opt\/chef-workstation\/bin\/chef export #{Regexp.escape(policy_file)} dist\/#{Regexp.escape(env)}\/#{Regexp.escape(policy)} --chef-license accept#{data_bags ? " && cp -ar data_bags/ dist/#{Regexp.escape(env)}/#{Regexp.escape(policy)}/" : ''}$/,
+              %r{^cd #{Regexp.escape(repository)} &&\s+sudo rm -rf dist/#{Regexp.escape(env)}/#{Regexp.escape(policy)} &&\s+/opt/chef-workstation/bin/chef export #{Regexp.escape(policy_file)} dist/#{Regexp.escape(env)}/#{Regexp.escape(policy)} --chef-license accept#{data_bags ? " && cp -ar data_bags/ dist/#{Regexp.escape(env)}/#{Regexp.escape(policy)}/" : ''}$},
               proc do
                 FileUtils.mkdir_p "#{repository}/dist/#{env}/#{policy}"
                 FileUtils.cp_r("#{repository}/data_bags", "#{repository}/dist/#{env}/#{policy}/") if data_bags
@@ -56,16 +57,15 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
           ]
         else
           []
-        end
-      ) do
-        yield
-      end
+        end,
+        &block
+      )
     end
 
     context 'with an empty platform' do
 
       it 'packages the repository doing nothing' do
-        with_serverless_chef_platforms('empty') do |platform, repository|
+        with_serverless_chef_platforms('empty') do |platform|
           with_cmd_runner_mocked([]) do
             platform.package(services: {}, secrets: {}, local_environment: false)
           end
@@ -118,15 +118,6 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
         end
       end
 
-      it 'packages the repository without resolving dependencies when the lock file already exists' do
-        with_serverless_chef_platforms('1_node') do |platform, repository|
-          File.write("#{repository}/policyfiles/test_policy.lock.json", '{}')
-          with_packaging_mocked(repository, install: false) do
-            platform.package(services: { 'node' => %w[test_policy] }, secrets: {}, local_environment: false)
-          end
-        end
-      end
-
       it 'does not package the repository twice for the same config' do
         with_serverless_chef_platforms('1_node', as_git: true) do |platform, repository|
           with_packaging_mocked(repository) do
@@ -184,7 +175,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
           # Wait 2 seconds so that we are sure the modified file will return a different timestamp
           sleep 2
           with_packaging_mocked(repository, install: false) do
-            File.write("#{repository}/chef_versions.yml", File.read("#{repository}/chef_versions.yml") + "\n\n")
+            File.write("#{repository}/chef_versions.yml", "#{File.read("#{repository}/chef_versions.yml")}\n\n")
             platform.package(services: { 'node' => %w[test_policy] }, secrets: {}, local_environment: false)
           end
         end
@@ -247,11 +238,13 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
             platform.package(services: { 'node' => %w[test_policy] }, secrets: {}, local_environment: true)
             local_policy_file = "#{repository}/policyfiles/test_policy.local.lock.json"
             expect(File.exist?(local_policy_file)).to eq true
-            expect(JSON.parse(File.read(local_policy_file))).to eq('run_list' => [
-              'hpc_test::before_run',
-              'recipe[test_cookbook]',
-              'hpc_test::after_run'
-            ])
+            expect(JSON.parse(File.read(local_policy_file))).to eq(
+              'run_list' => [
+                'hpc_test::before_run',
+                'recipe[test_cookbook]',
+                'hpc_test::after_run'
+              ]
+            )
           end
         end
       end
@@ -263,10 +256,12 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
             platform.package(services: { 'node' => %w[test_policy] }, secrets: {}, local_environment: true)
             local_policy_file = "#{repository}/policyfiles/test_policy.local.lock.json"
             expect(File.exist?(local_policy_file)).to eq true
-            expect(JSON.parse(File.read(local_policy_file))).to eq('run_list' => [
-              'hpc_test::before_run',
-              'recipe[test_cookbook]'
-            ])
+            expect(JSON.parse(File.read(local_policy_file))).to eq(
+              'run_list' => [
+                'hpc_test::before_run',
+                'recipe[test_cookbook]'
+              ]
+            )
           end
         end
       end
@@ -278,10 +273,12 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
             platform.package(services: { 'node' => %w[test_policy] }, secrets: {}, local_environment: true)
             local_policy_file = "#{repository}/policyfiles/test_policy.local.lock.json"
             expect(File.exist?(local_policy_file)).to eq true
-            expect(JSON.parse(File.read(local_policy_file))).to eq('run_list' => [
-              'recipe[test_cookbook]',
-              'hpc_test::after_run'
-            ])
+            expect(JSON.parse(File.read(local_policy_file))).to eq(
+              'run_list' => [
+                'recipe[test_cookbook]',
+                'hpc_test::after_run'
+              ]
+            )
           end
         end
       end

data/spec/hybrid_platforms_conductor_test/api/platform_handlers/serverless_chef/services_deployment_spec.rb

@@ -1,6 +1,6 @@
 describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef do
 
-  context 'checking services deployment' do
+  context 'when checking services deployment' do
 
     # Simulate a packaging of a given repository
     #
@@ -60,7 +60,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
     context 'with an empty platform' do
 
       it 'prepares for deploy' do
-        with_serverless_chef_platforms('empty') do |platform, repository|
+        with_serverless_chef_platforms('empty') do |platform|
           platform.prepare_for_deploy(
             services: {},
             secrets: {},
@@ -71,7 +71,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
       end
 
       it 'prepares for deploy in why-run mode' do
-        with_serverless_chef_platforms('empty') do |platform, repository|
+        with_serverless_chef_platforms('empty') do |platform|
           platform.prepare_for_deploy(
             services: {},
             secrets: {},
@@ -82,7 +82,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
       end
 
       it 'prepares for deploy in local mode' do
-        with_serverless_chef_platforms('empty') do |platform, repository|
+        with_serverless_chef_platforms('empty') do |platform|
           platform.prepare_for_deploy(
             services: {},
             secrets: {},
@@ -127,8 +127,8 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
             'image' => 'debian_9',
             'new_metadata' => 'new_value',
             'private_ips' => ['172.16.0.1'],
-            'property1' => { 'property11' => 'value11' },
-            'property2' => 'value2',
+            'property_1' => { 'property_11' => 'value11' },
+            'property_2' => 'value2'
           )
         end
       end
@@ -253,15 +253,15 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
 
       it 'deploys a service on a node belonging to another platform' do
         with_serverless_chef_platforms({ 'p1' => '1_node', 'p2' => 'several_nodes' }) do |repositories|
-          platform_p1, repository_p1 = repositories.find { |platform, _repository| platform.name == 'p1' }
-          mock_package(repository_p1)
-          platform_p1.prepare_for_deploy(
+          platform_1, repository_1 = repositories.find { |platform, _repository| platform.name == 'p1' }
+          mock_package(repository_1)
+          platform_1.prepare_for_deploy(
             services: { 'node2' => %w[test_policy_1] },
             secrets: {},
             local_environment: false,
             why_run: false
           )
-          expect(platform_p1.actions_to_deploy_on('node2', 'test_policy_1', use_why_run: false)).to eq expected_actions_to_deploy_chef(repository_p1, policy: 'test_policy_1', node: 'node2')
+          expect(platform_1.actions_to_deploy_on('node2', 'test_policy_1', use_why_run: false)).to eq expected_actions_to_deploy_chef(repository_1, policy: 'test_policy_1', node: 'node2')
         end
       end
 

data/spec/hybrid_platforms_conductor_test/api/platforms_handler_spec.rb

@@ -1,19 +1,21 @@
 describe HybridPlatformsConductor::PlatformsHandler do
 
-  context 'checking config specific DSL' do
+  context 'when checking config specific DSL' do
 
     it 'returns platform directories along with platform types' do
       with_test_platforms(
-        'platform1' => { platform_type: :test },
-        'platform2' => { platform_type: :test2 },
-        'platform3' => { platform_type: :test }
+        {
+          'platform1' => { platform_type: :test },
+          'platform2' => { platform_type: :test_2 },
+          'platform3' => { platform_type: :test }
+        }
       ) do |repositories|
-        expect(test_config.platform_dirs.keys.sort).to eq %i[test test2].sort
+        expect(test_config.platform_dirs.keys.sort).to eq %i[test test_2].sort
         expect(test_config.platform_dirs[:test].sort).to eq [
           repositories['platform1'],
           repositories['platform3']
         ].sort
-        expect(test_config.platform_dirs[:test2].sort).to eq [
+        expect(test_config.platform_dirs[:test_2].sort).to eq [
           repositories['platform2']
         ].sort
       end
@@ -22,35 +24,39 @@ describe HybridPlatformsConductor::PlatformsHandler do
   end
 
   it 'returns no platform types by default' do
-    with_test_platforms do
+    with_test_platforms({}) do
       expect(test_platforms_handler.platform_types).to eq({})
     end
   end
 
   it 'returns no platform by default' do
-    with_test_platforms do
+    with_test_platforms({}) do
       expect(test_platforms_handler.known_platforms).to eq []
     end
   end
 
   it 'returns defined platform types' do
     with_test_platforms(
-      'platform1' => { platform_type: :test },
-      'platform2' => { platform_type: :test2 },
-      'platform3' => { platform_type: :test }
+      {
+        'platform1' => { platform_type: :test },
+        'platform2' => { platform_type: :test_2 },
+        'platform3' => { platform_type: :test }
+      }
     ) do
       expect(test_platforms_handler.platform_types).to eq(
         test: HybridPlatformsConductorTest::PlatformHandlerPlugins::Test,
-        test2: HybridPlatformsConductorTest::PlatformHandlerPlugins::Test2
+        test_2: HybridPlatformsConductorTest::PlatformHandlerPlugins::Test2
       )
     end
   end
 
   it 'returns defined platforms' do
     with_test_platforms(
-      'platform1' => { platform_type: :test },
-      'platform2' => { platform_type: :test2 },
-      'platform3' => { platform_type: :test }
+      {
+        'platform1' => { platform_type: :test },
+        'platform2' => { platform_type: :test_2 },
+        'platform3' => { platform_type: :test }
+      }
     ) do
       expect(test_platforms_handler.known_platforms.map(&:name).sort).to eq %w[platform1 platform2 platform3].sort
     end
@@ -61,10 +67,9 @@ describe HybridPlatformsConductor::PlatformsHandler do
       with_test_platforms(
         {
           'platform1' => { platform_type: :test },
-          'platform2' => { platform_type: :test2 }
+          'platform2' => { platform_type: :test_2 }
         },
-        false,
-        "test2_platform path: \'#{repository}\'"
+        additional_config: "test_2_platform path: \'#{repository}\'"
       ) do
         expect { test_platforms_handler.known_platforms }.to raise_error 'Platform name platform1 is declared several times.'
       end
@@ -73,9 +78,11 @@ describe HybridPlatformsConductor::PlatformsHandler do
 
   it 'returns defined platforms filtered by platform type' do
     with_test_platforms(
-      'platform1' => { platform_type: :test },
-      'platform2' => { platform_type: :test2 },
-      'platform3' => { platform_type: :test }
+      {
+        'platform1' => { platform_type: :test },
+        'platform2' => { platform_type: :test_2 },
+        'platform3' => { platform_type: :test }
+      }
     ) do
       expect(test_platforms_handler.known_platforms(platform_type: :test).map(&:name).sort).to eq %w[platform1 platform3].sort
     end
@@ -83,9 +90,11 @@ describe HybridPlatformsConductor::PlatformsHandler do
 
   it 'selects a platform based on its name' do
     with_test_platforms(
-      'platform1' => { platform_type: :test },
-      'platform2' => { platform_type: :test2 },
-      'platform3' => { platform_type: :test }
+      {
+        'platform1' => { platform_type: :test },
+        'platform2' => { platform_type: :test_2 },
+        'platform3' => { platform_type: :test }
+      }
     ) do
       expect(test_platforms_handler.platform('platform2').name).to eq 'platform2'
     end
@@ -93,9 +102,11 @@ describe HybridPlatformsConductor::PlatformsHandler do
 
   it 'selects nil for an unknown platform name' do
     with_test_platforms(
-      'platform1' => { platform_type: :test },
-      'platform2' => { platform_type: :test2 },
-      'platform3' => { platform_type: :test }
+      {
+        'platform1' => { platform_type: :test },
+        'platform2' => { platform_type: :test_2 },
+        'platform3' => { platform_type: :test }
+      }
     ) do
       expect(test_platforms_handler.platform('platform4')).to eq nil
     end

data/spec/hybrid_platforms_conductor_test/api/plugins_spec.rb

@@ -44,7 +44,7 @@ module HybridPlatformsConductorTest
       #
       # Parameters::
       # * *value* (Integer): Value to be set
-      def set_my_property(value)
+      def config_my_property(value)
         @my_property = value * 2
       end
 
@@ -69,7 +69,7 @@ module HybridPlatformsConductorTest
       #
       # Parameters::
       # * *value* (Integer): Value to be set
-      def set_my_other_property(value)
+      def config_my_other_property(value)
         @my_other_property += value
       end
 
@@ -84,14 +84,14 @@ end
 describe HybridPlatformsConductor::Plugins do
 
   it 'returns no plugins by default' do
-    with_test_platform do
-      expect(HybridPlatformsConductor::Plugins.new(:test_plugin_type, logger: logger, logger_stderr: logger).keys).to eq []
+    with_test_platform({}) do
+      expect(described_class.new(:test_plugin_type, logger: logger, logger_stderr: logger).keys).to eq []
     end
   end
 
   it 'can register a new plugin with a given class' do
-    with_test_platform do
-      plugins = HybridPlatformsConductor::Plugins.new(:test_plugin_type, logger: logger, logger_stderr: logger)
+    with_test_platform({}) do
+      plugins = described_class.new(:test_plugin_type, logger: logger, logger_stderr: logger)
       plugins[:new_plugin] = HybridPlatformsConductorTest::RandomClass
       expect(plugins.keys).to eq [:new_plugin]
       expect(plugins[:new_plugin]).to eq HybridPlatformsConductorTest::RandomClass
@@ -99,8 +99,8 @@ describe HybridPlatformsConductor::Plugins do
   end
 
   it 'can register a new plugin with an initializer' do
-    with_test_platform do
-      plugins = HybridPlatformsConductor::Plugins.new(
+    with_test_platform({}) do
+      plugins = described_class.new(
         :test_plugin_type,
         init_plugin: proc do |plugin_class|
           plugin_class.name
@@ -115,8 +115,8 @@ describe HybridPlatformsConductor::Plugins do
   end
 
   it 'validates a plugin class before registering it' do
-    with_test_platform do
-      plugins = HybridPlatformsConductor::Plugins.new(:test_plugin_type, logger: logger, logger_stderr: logger)
+    with_test_platform({}) do
+      plugins = described_class.new(:test_plugin_type, logger: logger, logger_stderr: logger)
       HybridPlatformsConductorTest::RandomClassWithValidation.validation_done = false
       HybridPlatformsConductorTest::RandomClassWithValidation.validation_result = true
       plugins[:new_plugin] = HybridPlatformsConductorTest::RandomClassWithValidation
@@ -127,8 +127,8 @@ describe HybridPlatformsConductor::Plugins do
   end
 
   it 'does not register a plugin that fails validation' do
-    with_test_platform do
-      plugins = HybridPlatformsConductor::Plugins.new(:test_plugin_type, logger: logger, logger_stderr: logger)
+    with_test_platform({}) do
+      plugins = described_class.new(:test_plugin_type, logger: logger, logger_stderr: logger)
       HybridPlatformsConductorTest::RandomClassWithValidation.validation_done = false
       HybridPlatformsConductorTest::RandomClassWithValidation.validation_result = false
       plugins[:new_plugin] = HybridPlatformsConductorTest::RandomClassWithValidation
@@ -138,16 +138,14 @@ describe HybridPlatformsConductor::Plugins do
   end
 
   it 'discovers automatically plugins of a given type in the hpc_plugins directory of a gem' do
-    with_test_platform do
+    with_test_platform({}) do
       # Mock the discovery of Ruby gems
       expect(Gem).to receive(:loaded_specs) do
-        my_test_gem_spec = double('Test gemspec for gem my_test_gem')
-        expect(my_test_gem_spec).to receive(:full_gem_path) { '__gem_full_path__' }
-        expect(Dir).to receive(:glob).with('__gem_full_path__/lib/**/*.rb') do
-          [
-            '__gem_full_path__/lib/my_test_gem/hpc_plugins/test_plugin_type/test_plugin_id1.rb'
-          ]
-        end
+        my_test_gem_spec = instance_double Gem::Specification
+        expect(my_test_gem_spec).to receive(:full_gem_path).and_return('__gem_full_path__')
+        expect(Dir).to receive(:glob).with('__gem_full_path__/lib/**/*.rb').and_return [
+          '__gem_full_path__/lib/my_test_gem/hpc_plugins/test_plugin_type/test_plugin_id_1.rb'
+        ]
         {
           'my_test_gem' => my_test_gem_spec
         }
@@ -155,9 +153,9 @@ describe HybridPlatformsConductor::Plugins do
       # Alter the load path to mock an extra Rubygem
       $LOAD_PATH.unshift "#{__dir__}/../mocked_lib"
       begin
-        plugins = HybridPlatformsConductor::Plugins.new(:test_plugin_type, logger: logger, logger_stderr: logger)
-        expect(plugins.keys).to eq [:test_plugin_id1]
-        expect(plugins[:test_plugin_id1]).to eq HybridPlatformsConductorTest::MockedLib::MyTestGem::HpcPlugins::TestPluginType::TestPluginId1
+        plugins = described_class.new(:test_plugin_type, logger: logger, logger_stderr: logger)
+        expect(plugins.keys).to eq [:test_plugin_id_1]
+        expect(plugins[:test_plugin_id_1]).to eq HybridPlatformsConductorTest::MockedLib::MyTestGem::HpcPlugins::TestPluginType::TestPluginId1
       ensure
         $LOAD_PATH.shift
       end
@@ -165,25 +163,21 @@ describe HybridPlatformsConductor::Plugins do
   end
 
   it 'discovers automatically several plugins of different types in the hpc_plugins directories of several gems' do
-    with_test_platform do
+    with_test_platform({}) do
       # Mock the discovery of Ruby gems
       expect(Gem).to receive(:loaded_specs).twice do
-        my_test_gem_spec = double('Test gemspec for gem my_test_gem')
-        expect(my_test_gem_spec).to receive(:full_gem_path) { '__gem_full_path__' }
-        expect(Dir).to receive(:glob).with('__gem_full_path__/lib/**/*.rb') do
-          [
-            '__gem_full_path__/lib/my_test_gem/hpc_plugins/test_plugin_type/test_plugin_id1.rb',
-            '__gem_full_path__/lib/my_test_gem/hpc_plugins/test_plugin_type/test_plugin_id2.rb'
-          ]
-        end
-        my_test_gem2_spec = double('Test gemspec for gem my_test_gem2')
-        expect(my_test_gem2_spec).to receive(:full_gem_path) { '__gem2_full_path__' }
-        expect(Dir).to receive(:glob).with('__gem2_full_path__/lib/**/*.rb') do
-          [
-            '__gem2_full_path__/lib/my_test_gem2/sub_dir/hpc_plugins/test_plugin_type/test_plugin_id3.rb',
-            '__gem2_full_path__/lib/my_test_gem2/sub_dir/hpc_plugins/test_plugin_type2/test_plugin_id4.rb'
-          ]
-        end
+        my_test_gem_spec = instance_double Gem::Specification
+        expect(my_test_gem_spec).to receive(:full_gem_path).and_return('__gem_full_path__')
+        expect(Dir).to receive(:glob).with('__gem_full_path__/lib/**/*.rb').and_return [
+          '__gem_full_path__/lib/my_test_gem/hpc_plugins/test_plugin_type/test_plugin_id_1.rb',
+          '__gem_full_path__/lib/my_test_gem/hpc_plugins/test_plugin_type/test_plugin_id_2.rb'
+        ]
+        my_test_gem2_spec = instance_double Gem::Specification
+        expect(my_test_gem2_spec).to receive(:full_gem_path).and_return('__gem2_full_path__')
+        expect(Dir).to receive(:glob).with('__gem2_full_path__/lib/**/*.rb').and_return [
+          '__gem2_full_path__/lib/my_test_gem2/sub_dir/hpc_plugins/test_plugin_type/test_plugin_id_3.rb',
+          '__gem2_full_path__/lib/my_test_gem2/sub_dir/hpc_plugins/test_plugin_type_2/test_plugin_id_4.rb'
+        ]
         {
           'my_test_gem' => my_test_gem_spec,
           'my_test_gem2' => my_test_gem2_spec
@@ -192,14 +186,14 @@ describe HybridPlatformsConductor::Plugins do
       # Alter the load path to mock an extra Rubygem
       $LOAD_PATH.unshift "#{__dir__}/../mocked_lib"
       begin
-        plugins = HybridPlatformsConductor::Plugins.new(:test_plugin_type, logger: logger, logger_stderr: logger)
-        expect(plugins.keys.sort).to eq %i[test_plugin_id1 test_plugin_id2 test_plugin_id3].sort
-        expect(plugins[:test_plugin_id1]).to eq HybridPlatformsConductorTest::MockedLib::MyTestGem::HpcPlugins::TestPluginType::TestPluginId1
-        expect(plugins[:test_plugin_id2]).to eq HybridPlatformsConductorTest::MockedLib::MyTestGem::HpcPlugins::TestPluginType::TestPluginId2
-        expect(plugins[:test_plugin_id3]).to eq HybridPlatformsConductorTest::MockedLib::MyTestGem2::SubDir::HpcPlugins::TestPluginType::TestPluginId3
-        plugins2 = HybridPlatformsConductor::Plugins.new(:test_plugin_type2, logger: logger, logger_stderr: logger)
-        expect(plugins2.keys).to eq [:test_plugin_id4]
-        expect(plugins2[:test_plugin_id4]).to eq HybridPlatformsConductorTest::MockedLib::MyTestGem2::SubDir::HpcPlugins::TestPluginType2::TestPluginId4
+        plugins = described_class.new(:test_plugin_type, logger: logger, logger_stderr: logger)
+        expect(plugins.keys.sort).to eq %i[test_plugin_id_1 test_plugin_id_2 test_plugin_id_3].sort
+        expect(plugins[:test_plugin_id_1]).to eq HybridPlatformsConductorTest::MockedLib::MyTestGem::HpcPlugins::TestPluginType::TestPluginId1
+        expect(plugins[:test_plugin_id_2]).to eq HybridPlatformsConductorTest::MockedLib::MyTestGem::HpcPlugins::TestPluginType::TestPluginId2
+        expect(plugins[:test_plugin_id_3]).to eq HybridPlatformsConductorTest::MockedLib::MyTestGem2::SubDir::HpcPlugins::TestPluginType::TestPluginId3
+        plugins_2 = described_class.new(:test_plugin_type_2, logger: logger, logger_stderr: logger)
+        expect(plugins_2.keys).to eq [:test_plugin_id_4]
+        expect(plugins_2[:test_plugin_id_4]).to eq HybridPlatformsConductorTest::MockedLib::MyTestGem2::SubDir::HpcPlugins::TestPluginType2::TestPluginId4
       ensure
         $LOAD_PATH.shift
       end
@@ -207,10 +201,10 @@ describe HybridPlatformsConductor::Plugins do
   end
 
   it 'does not discover automatically plugins from gems if asked' do
-    with_test_platform do
+    with_test_platform({}) do
       # Mock the discovery of Ruby gems
       expect(Gem).not_to receive(:loaded_specs)
-      expect(HybridPlatformsConductor::Plugins.new(:test_plugin_type, parse_gems: false, logger: logger, logger_stderr: logger).keys).to eq []
+      expect(described_class.new(:test_plugin_type, parse_gems: false, logger: logger, logger_stderr: logger).keys).to eq []
     end
   end
 
@@ -218,7 +212,7 @@ describe HybridPlatformsConductor::Plugins do
     with_repository('platform') do |repository|
       with_platforms("
         test_platform path: '#{repository}'
-        set_my_property 42
+        config_my_property 42
       ") do
         register_platform_handlers test: HybridPlatformsConductorTest::PlatformHandlerPlugins::Test
         self.test_platforms_info = { 'platform' => {} }
@@ -231,7 +225,7 @@ describe HybridPlatformsConductor::Plugins do
     with_repository('platform') do |repository|
       with_platforms("
         test_platform path: '#{repository}'
-        set_my_other_property 66
+        config_my_other_property 66
       ") do
         register_platform_handlers test: HybridPlatformsConductorTest::PlatformHandlerPlugins::Test
         self.test_platforms_info = { 'platform' => {} }