hybrid_platforms_conductor 33.9.4 → 34.0.0

data/spec/hybrid_platforms_conductor_test/helpers/connector_ssh_helpers.rb

@@ -43,12 +43,10 @@ module HybridPlatformsConductorTest
           ssh_commands_per_connection = []
           if with_strict_host_key_checking
             ip = node_connection_info[:ip] || node_connection_info[:connection]
-            ssh_commands_once.concat(
+            ssh_commands_once.push(
               [
-                [
-                  "ssh-keyscan -p #{node_connection_info[:port]} #{ip}",
-                  proc { [0, "#{ip} ssh-rsa fake_host_key_for_#{ip}", ''] }
-                ]
+                "ssh-keyscan -p #{node_connection_info[:port]} #{ip}",
+                proc { [0, "#{ip} ssh-rsa fake_host_key_for_#{ip}", ''] }
               ]
             )
           end
@@ -144,7 +142,7 @@ module HybridPlatformsConductorTest
           with_cmd_runner_mocked(
             [
               ['which env', proc { [0, "/usr/bin/env\n", ''] }],
-              ['ssh -V 2>&1', proc { [0, "OpenSSH_7.4p1 Debian-10+deb9u7, OpenSSL 1.0.2u  20 Dec 2019\n", ''] }]
+              ['ssh -V 2>&1', proc { [0, "OpenSSH_9.8p1 Debian-10+deb9u7, OpenSSL 1.0.2u  20 Dec 2019\n", ''] }]
             ] +
               (password ? [['sshpass -V', proc { [0, "sshpass 1.06\n", ''] }]] : []) +
               ssh_expected_commands_for(

data/spec/hybrid_platforms_conductor_test/helpers/deployer_helpers.rb

@@ -97,7 +97,7 @@ module HybridPlatformsConductorTest
       # Parameters::
       # * *services* (Hash<String, Array<String> >): List of services to be expected, per node name
       def expect_services_handler_to_deploy(services)
-        expect(test_services_handler).to receive(:deploy_allowed?).with(
+        expect(test_services_handler).to receive(:barrier_to_deploy).with(
           services: services,
           local_environment: false
         ).and_return(nil)
@@ -187,7 +187,7 @@ module HybridPlatformsConductorTest
       # Parameters::
       # * *nodes_info* (Hash): Node info to give the platform [default: 1 node having 1 service]
       # * *expect_services_to_deploy* (Hash<String,Array<String>>): Expected services to be deployed [default: all services from nodes_info]
-      # * *expect_deploy_allowed* (Boolean): Should we expect the call to deploy_allowed? [default: true]
+      # * *expect_deploy_allowed* (Boolean): Should we expect the call to barrier_to_deploy [default: true]
       # * *expect_package* (Boolean): Should we expect packaging? [default: true]
       # * *expect_prepare_for_deploy* (Boolean): Should we expect calls to prepare for deploy? [default: true]
       # * *expect_connections_to_nodes* (Boolean): Should we expect connections to nodes? [default: true]
@@ -223,7 +223,7 @@ module HybridPlatformsConductorTest
         with_test_platform(nodes_info, as_git: !check_mode, additional_config: "#{additional_config}\nsend_logs_to :test_log") do |repository|
           # Mock the ServicesHandler accesses
           if !check_mode && expect_deploy_allowed
-            expect(test_services_handler).to receive(:deploy_allowed?).with(
+            expect(test_services_handler).to receive(:barrier_to_deploy).with(
               services: expect_services_to_deploy,
               local_environment: expect_local_environment
             ).and_return(nil)

data/spec/hybrid_platforms_conductor_test/helpers/executables_helpers.rb

@@ -62,7 +62,7 @@ module HybridPlatformsConductorTest
           allow(component_class).to(receive(:new).once { component })
         end
         # Run the executable
-        args.concat(['--debug']) if ENV['TEST_DEBUG'] == '1'
+        args.push('--debug') if ENV['TEST_DEBUG'] == '1'
         ARGV.replace(args)
         old_program_name = $PROGRAM_NAME
         $0 = executable

data/spec/hybrid_platforms_conductor_test/helpers/provisioner_proxmox_helpers.rb

@@ -359,7 +359,7 @@ module HybridPlatformsConductorTest
           end
         ]
         if destroy_vm
-          runs.concat [
+          runs.push(
             proc do |actions|
               expect(actions.keys).to eq ['node']
               expect(actions['node'].size).to eq 4
@@ -409,7 +409,7 @@ module HybridPlatformsConductorTest
                 #{JSON.pretty_generate(result)}
               EO_STDOUT
             end
-          ]
+          )
         end
         expect_actions_executor_runs runs
       end
@@ -722,12 +722,12 @@ module HybridPlatformsConductorTest
         unless create.nil?
           create_file = "#{@repository}/proxmox/create_vm.json"
           File.write(create_file, create.to_json)
-          script_args.concat(['--create', create_file])
+          script_args.push('--create', create_file)
         end
         unless destroy.nil?
           destroy_file = "#{@repository}/proxmox/destroy_vm.json"
           File.write(destroy_file, destroy.to_json)
-          script_args.concat(['--destroy', destroy_file])
+          script_args.push('--destroy', destroy_file)
         end
         # Call the script by loading the Ruby file mocking the ARGV and ENV variables
         old_argv = ARGV.dup

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/recipes/35_unparsable_include.rb

@@ -1,5 +1,5 @@
-cookbook_name = ENV['cookbook_name']
-recipe_name = ENV['recipe_name']
+cookbook_name = ENV.fetch('cookbook_name', nil)
+recipe_name = ENV.fetch('recipe_name', nil)
 # rubocop:disable Style/StringConcatenation
 include_recipe(
   cookbook_name + '::' + recipe_name

data/spec/hybrid_platforms_conductor_test/test_log_no_read_plugin.rb

@@ -31,7 +31,7 @@ module HybridPlatformsConductorTest
         node: node,
         services: services,
         # Don't store the date
-        deployment_info: deployment_info.reject { |k, _v| k == :date },
+        deployment_info: deployment_info.except(:date),
         exit_status: exit_status,
         stdout: stdout,
         stderr: stderr

data/spec/hybrid_platforms_conductor_test/test_log_plugin.rb

@@ -31,7 +31,7 @@ module HybridPlatformsConductorTest
         node: node,
         services: services,
         # Don't store the date
-        deployment_info: deployment_info.reject { |k, _v| k == :date },
+        deployment_info: deployment_info.except(:date),
         exit_status: exit_status,
         stdout: stdout,
         stderr: stderr

data/spec/hybrid_platforms_conductor_test.rb

@@ -154,6 +154,7 @@ module HybridPlatformsConductorTest
         FileUtils.rm_rf './run_logs'
         FileUtils.rm_rf './testadmin.key.pub'
         FileUtils.rm_rf '/tmp/hpc_ssh'
+        FileUtils.rm_rf './test_stdout'
         register_plugins(
           :log,
           {
@@ -204,8 +205,8 @@ module HybridPlatformsConductorTest
         logger.level = Logger::DEBUG
         logger
       else
-        # Still put the level, as when testing executables we switch the device from /dev/null to a file
-        Logger.new('/dev/null', level: :info)
+        # Still put the level, as when testing executables we use a file to test logs
+        Logger.new('./test_stdout', level: :info)
       end
     end