hybrid_platforms_conductor 32.17.0 → 33.0.2

data/spec/hybrid_platforms_conductor_test/executables/options/reports_handler_spec.rb

@@ -7,7 +7,7 @@ describe 'executables\' Reports Handler options' do
   #   * Parameters::
   #     * *repository* (String): Platform's repository
   def with_test_platform_for_reports_handler_options
-    with_test_platform do |repository|
+    with_test_platform({}) do |repository|
       register_report_plugins(test_reports_handler, report_format: HybridPlatformsConductorTest::ReportPlugin)
       yield repository
     end

data/spec/hybrid_platforms_conductor_test/executables/options/tests_runner_spec.rb

@@ -1,7 +1,7 @@
 describe 'executables\' Tests Runner options' do
 
   it 'specifies a given test to execute' do
-    with_test_platform do
+    with_test_platform({}) do
       expect(test_tests_runner).to receive(:run_tests).with([]) do
         expect(test_tests_runner.tests.sort).to eq %i[my_test]
         0
@@ -14,12 +14,12 @@ describe 'executables\' Tests Runner options' do
   end
 
   it 'specifies several tests to execute' do
-    with_test_platform do
+    with_test_platform({}) do
       expect(test_tests_runner).to receive(:run_tests).with([]) do
-        expect(test_tests_runner.tests.sort).to eq %i[my_test1 my_test2]
+        expect(test_tests_runner.tests.sort).to eq %i[my_test_1 my_test_2]
         0
       end
-      exit_code, stdout, stderr = run 'test', '--test', 'my_test1', '--test', 'my_test2'
+      exit_code, stdout, stderr = run 'test', '--test', 'my_test_1', '--test', 'my_test_2'
       expect(exit_code).to eq 0
       expect(stdout).to eq ''
       expect(stderr).to eq ''
@@ -27,11 +27,11 @@ describe 'executables\' Tests Runner options' do
   end
 
   it 'specifies a tests file to execute' do
-    with_test_platform do |repository|
+    with_test_platform({}) do |repository|
       tests_file = "#{repository}/my_tests.txt"
-      File.write(tests_file, "my_test1\n# Comment to ignore\nmy_test2\n")
+      File.write(tests_file, "my_test_1\n# Comment to ignore\nmy_test_2\n")
       expect(test_tests_runner).to receive(:run_tests).with([]) do
-        expect(test_tests_runner.tests.sort).to eq %i[my_test1 my_test2]
+        expect(test_tests_runner.tests.sort).to eq %i[my_test_1 my_test_2]
         0
       end
       exit_code, stdout, stderr = run 'test', '--tests-list', tests_file
@@ -42,16 +42,16 @@ describe 'executables\' Tests Runner options' do
   end
 
   it 'specifies a mix of tests files and test names to execute' do
-    with_test_platform do |repository|
-      tests_file1 = "#{repository}/my_tests1.txt"
-      File.write(tests_file1, "my_test1\n# Comment to ignore\nmy_test2\n")
-      tests_file2 = "#{repository}/my_tests2.txt"
-      File.write(tests_file2, "my_test4\n# Comment to ignore\nmy_test5\n")
+    with_test_platform({}) do |repository|
+      tests_file_1 = "#{repository}/my_tests1.txt"
+      File.write(tests_file_1, "my_test_1\n# Comment to ignore\nmy_test_2\n")
+      tests_file_2 = "#{repository}/my_tests2.txt"
+      File.write(tests_file_2, "my_test_4\n# Comment to ignore\nmy_test_5\n")
       expect(test_tests_runner).to receive(:run_tests).with([]) do
-        expect(test_tests_runner.tests.sort).to eq %i[my_test1 my_test2 my_test3 my_test4 my_test5 my_test6]
+        expect(test_tests_runner.tests.sort).to eq %i[my_test_1 my_test_2 my_test_3 my_test_4 my_test_5 my_test_6]
         0
       end
-      exit_code, stdout, stderr = run 'test', '--tests-list', tests_file1, '--test', 'my_test3', '--tests-list', tests_file2, '--test', 'my_test6'
+      exit_code, stdout, stderr = run 'test', '--tests-list', tests_file_1, '--test', 'my_test_3', '--tests-list', tests_file_2, '--test', 'my_test_6'
       expect(exit_code).to eq 0
       expect(stdout).to eq ''
       expect(stderr).to eq ''
@@ -59,7 +59,7 @@ describe 'executables\' Tests Runner options' do
   end
 
   it 'uses current run_logs instead of executing new check-nodes' do
-    with_test_platform do
+    with_test_platform({}) do
       expect(test_tests_runner).to receive(:run_tests).with([]) do
         expect(test_tests_runner.skip_run).to eq true
         0
@@ -72,7 +72,7 @@ describe 'executables\' Tests Runner options' do
   end
 
   it 'reports into a given format' do
-    with_test_platform do
+    with_test_platform({}) do
       expect(test_tests_runner).to receive(:run_tests).with([]) do
         expect(test_tests_runner.reports).to eq %i[my_report]
         0
@@ -85,12 +85,12 @@ describe 'executables\' Tests Runner options' do
   end
 
   it 'reports into several formats' do
-    with_test_platform do
+    with_test_platform({}) do
       expect(test_tests_runner).to receive(:run_tests).with([]) do
-        expect(test_tests_runner.reports.sort).to eq %i[my_report1 my_report2].sort
+        expect(test_tests_runner.reports.sort).to eq %i[my_report_1 my_report_2].sort
         0
       end
-      exit_code, stdout, stderr = run 'test', '--report', 'my_report1', '--report', 'my_report2'
+      exit_code, stdout, stderr = run 'test', '--report', 'my_report_1', '--report', 'my_report_2'
       expect(exit_code).to eq 0
       expect(stdout).to eq ''
       expect(stderr).to eq ''
@@ -98,7 +98,7 @@ describe 'executables\' Tests Runner options' do
   end
 
   it 'specifies the number of max threads for connections to nodes' do
-    with_test_platform do
+    with_test_platform({}) do
       expect(test_tests_runner).to receive(:run_tests).with([]) do
         expect(test_tests_runner.max_threads_connection_on_nodes).to eq 43
         0
@@ -111,7 +111,7 @@ describe 'executables\' Tests Runner options' do
   end
 
   it 'specifies the number of max threads for node tests' do
-    with_test_platform do
+    with_test_platform({}) do
       expect(test_tests_runner).to receive(:run_tests).with([]) do
         expect(test_tests_runner.max_threads_nodes).to eq 43
         0
@@ -124,7 +124,7 @@ describe 'executables\' Tests Runner options' do
   end
 
   it 'specifies the number of max threads for platform tests' do
-    with_test_platform do
+    with_test_platform({}) do
       expect(test_tests_runner).to receive(:run_tests).with([]) do
         expect(test_tests_runner.max_threads_platforms).to eq 43
         0

data/spec/hybrid_platforms_conductor_test/executables/report_spec.rb

@@ -1,57 +1,63 @@
 describe 'report executable' do
 
   it 'reports by default on all nodes' do
-    with_test_platform(nodes: { 'node1' => { services: ['node1_service'] }, 'node2' => { services: ['node2_service'] } }) do
+    with_test_platform({ nodes: { 'node1' => { services: ['node1_service'] }, 'node2' => { services: ['node2_service'] } } }) do
       exit_code, stdout, stderr = run 'report'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         +-------+----------+-----------+----+-----------+----+-------------+---------------+
         | Node  | Platform | Host name | IP | Physical? | OS | Description | Services      |
         +-------+----------+-----------+----+-----------+----+-------------+---------------+
         | node1 | platform |           |    | No        |    |             | node1_service |
         | node2 | platform |           |    | No        |    |             | node2_service |
         +-------+----------+-----------+----+-----------+----+-------------+---------------+
-      EOS
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
 
   it 'reports on given nodes only' do
-    with_test_platform(nodes: { 'node1' => { services: ['node1_service'] }, 'node2' => { services: ['node2_service'] } }) do
+    with_test_platform({ nodes: { 'node1' => { services: ['node1_service'] }, 'node2' => { services: ['node2_service'] } } }) do
       exit_code, stdout, stderr = run 'report', '--node', 'node2'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         +-------+----------+-----------+----+-----------+----+-------------+---------------+
         | Node  | Platform | Host name | IP | Physical? | OS | Description | Services      |
         +-------+----------+-----------+----+-----------+----+-------------+---------------+
         | node2 | platform |           |    | No        |    |             | node2_service |
         +-------+----------+-----------+----+-----------+----+-------------+---------------+
-      EOS
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
 
   it 'reports info from metadata' do
-    with_test_platform(nodes: { 'node' => {
-       meta: {
-        hostname: 'node.domain.com',
-        image: 'debian_10',
-        description: 'A great server'
-      },
-      services: ['node_service1', 'node_service2']
-    } }) do
+    with_test_platform(
+      {
+        nodes: {
+          'node' => {
+            meta: {
+              hostname: 'node.domain.com',
+              image: 'debian_10',
+              description: 'A great server'
+            },
+            services: %w[node_service1 node_service2]
+          }
+        }
+      }
+    ) do
       with_cmd_runner_mocked [
         ['getent hosts node.domain.com', proc { [0, '192.168.0.1 node.domain.com', ''] }]
       ] do
         exit_code, stdout, stderr = run 'report', '--node', 'node'
         expect(exit_code).to eq 0
-        expect(stdout).to eq <<~EOS
+        expect(stdout).to eq <<~EO_STDOUT
           +------+----------+-----------------+-------------+-----------+-----------+----------------+------------------------------+
           | Node | Platform | Host name       | IP          | Physical? | OS        | Description    | Services                     |
           +------+----------+-----------------+-------------+-----------+-----------+----------------+------------------------------+
           | node | platform | node.domain.com | 192.168.0.1 | No        | debian_10 | A great server | node_service1, node_service2 |
           +------+----------+-----------------+-------------+-----------+-----------+----------------+------------------------------+
-        EOS
+        EO_STDOUT
         expect(stderr).to eq ''
       end
     end

data/spec/hybrid_platforms_conductor_test/executables/run_spec.rb

@@ -3,25 +3,23 @@ describe 'run executable' do
   # Setup a platform for run tests
   #
   # Parameters::
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_run
-    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_run(&block)
+    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {} } }, &block)
   end
 
   it 'executes a single command on a node' do
     with_test_platform_for_run do
-      expect_actions_executor_runs([proc do |actions, timeout: nil, concurrent: false, log_to_dir: 'run_logs', log_to_stdout: true|
+      expect_actions_executor_runs([proc do |actions|
         expect(actions).to eq(['node1'] => [{ remote_bash: ['echo Hello'] }])
         test_actions_executor.stdout_device << "Hello\n"
         { 'node1' => [0, "Hello\n", ''] }
       end])
       exit_code, stdout, stderr = run 'run', '--node', 'node1', '--command', 'echo Hello'
       expect(exit_code).to eq 0
-      expect(stdout).to match /Hello/
+      expect(stdout).to match(/Hello/)
       expect(stderr).to eq ''
     end
   end
@@ -30,15 +28,15 @@ describe 'run executable' do
     with_test_platform_for_run do |repository|
       commands_file = "#{repository}/commands.txt"
       File.write(commands_file, "echo Hello1\necho Hello2\n")
-      expect_actions_executor_runs([proc do |actions, timeout: nil, concurrent: false, log_to_dir: 'run_logs', log_to_stdout: true|
+      expect_actions_executor_runs([proc do |actions|
         expect(actions).to eq(['node1'] => [{ remote_bash: [{ file: commands_file }] }])
         test_actions_executor.stdout_device << "Hello1\nHello2\n"
         { 'node1' => [0, "Hello1\nHello2\n", ''] }
       end])
       exit_code, stdout, stderr = run 'run', '--node', 'node1', '--command-file', commands_file
       expect(exit_code).to eq 0
-      expect(stdout).to match /Hello1/
-      expect(stdout).to match /Hello2/
+      expect(stdout).to match(/Hello1/)
+      expect(stdout).to match(/Hello2/)
       expect(stderr).to eq ''
     end
   end
@@ -53,14 +51,14 @@ describe 'run executable' do
       end])
       exit_code, stdout, stderr = run 'run', '--node', 'node1', '--command', 'echo Hello', '--timeout', '5'
       expect(exit_code).to eq 0
-      expect(stdout).to match /Hello/
+      expect(stdout).to match(/Hello/)
       expect(stderr).to eq ''
     end
   end
 
   it 'executes a single command on a node and captures stderr correctly' do
     with_test_platform_for_run do
-      expect_actions_executor_runs([proc do |actions, timeout: nil, concurrent: false, log_to_dir: 'run_logs', log_to_stdout: true|
+      expect_actions_executor_runs([proc do |actions|
         expect(actions).to eq(['node1'] => [{ remote_bash: ['echo Hello 2>&1'] }])
         test_actions_executor.stderr_device << "Hello\n"
         { 'node1' => [0, '', "Hello\n"] }
@@ -68,7 +66,7 @@ describe 'run executable' do
       exit_code, stdout, stderr = run 'run', '--node', 'node1', '--command', 'echo Hello 2>&1'
       expect(exit_code).to eq 0
       expect(stdout).to eq ''
-      expect(stderr).to match /Hello/
+      expect(stderr).to match(/Hello/)
     end
   end
 
@@ -82,22 +80,22 @@ describe 'run executable' do
       end])
       exit_code, stdout, stderr = run 'run', '--node', 'node1', '--node', 'node2', '--command', 'echo Hello'
       expect(exit_code).to eq 0
-      expect(stdout).to match /Hello/
+      expect(stdout).to match(/Hello/)
       expect(stderr).to eq ''
     end
   end
 
   it 'executes several commands' do
     with_test_platform_for_run do
-      expect_actions_executor_runs([proc do |actions, timeout: nil, concurrent: false, log_to_dir: 'run_logs', log_to_stdout: true|
+      expect_actions_executor_runs([proc do |actions|
         expect(actions).to eq(['node1'] => [{ remote_bash: ['echo Hello1', 'echo Hello2'] }])
         test_actions_executor.stdout_device << "Hello1\nHello2\n"
         { 'node1' => [0, "Hello1\nHello2\n", ''] }
       end])
       exit_code, stdout, stderr = run 'run', '--node', 'node1', '--command', 'echo Hello1', '--command', 'echo Hello2'
       expect(exit_code).to eq 0
-      expect(stdout).to match /Hello1/
-      expect(stdout).to match /Hello2/
+      expect(stdout).to match(/Hello1/)
+      expect(stdout).to match(/Hello2/)
       expect(stderr).to eq ''
     end
   end
@@ -108,24 +106,26 @@ describe 'run executable' do
       File.write(commands_file_1, "echo Hello1\necho Hello2\n")
       commands_file_2 = "#{repository}/commands2.txt"
       File.write(commands_file_1, "echo Hello4\necho Hello5\n")
-      expect_actions_executor_runs([proc do |actions, timeout: nil, concurrent: false, log_to_dir: 'run_logs', log_to_stdout: true|
-        expect(actions).to eq(['node1'] => [{ remote_bash: [
-          { file: commands_file_1 },
-          'echo Hello3',
-          { file: commands_file_2 },
-          'echo Hello6'
-        ] }])
+      expect_actions_executor_runs([proc do |actions|
+        expect(actions).to eq(
+          ['node1'] => [{ remote_bash: [
+            { file: commands_file_1 },
+            'echo Hello3',
+            { file: commands_file_2 },
+            'echo Hello6'
+          ] }]
+        )
         test_actions_executor.stdout_device << "Hello1\nHello2\nHello3\nHello4\nHello5\nHello6\n"
         { 'node1' => [0, "Hello1\nHello2\nHello3\nHello4\nHello5\nHello6\n", ''] }
       end])
       exit_code, stdout, stderr = run 'run', '--node', 'node1', '--commands-file', commands_file_1, '--command', 'echo Hello3', '--commands-file', commands_file_2, '--command', 'echo Hello6'
       expect(exit_code).to eq 0
-      expect(stdout).to match /Hello1/
-      expect(stdout).to match /Hello2/
-      expect(stdout).to match /Hello3/
-      expect(stdout).to match /Hello4/
-      expect(stdout).to match /Hello5/
-      expect(stdout).to match /Hello6/
+      expect(stdout).to match(/Hello1/)
+      expect(stdout).to match(/Hello2/)
+      expect(stdout).to match(/Hello3/)
+      expect(stdout).to match(/Hello4/)
+      expect(stdout).to match(/Hello5/)
+      expect(stdout).to match(/Hello6/)
       expect(stderr).to eq ''
     end
   end
@@ -140,14 +140,14 @@ describe 'run executable' do
       end])
       exit_code, stdout, stderr = run 'run', '--node', 'node1', '--node', 'node2', '--command', 'echo Hello', '--parallel'
       expect(exit_code).to eq 0
-      expect(stdout).to match /Hello/
+      expect(stdout).to match(/Hello/)
       expect(stderr).to eq ''
     end
   end
 
   it 'executes an interactive session on a node' do
     with_test_platform_for_run do
-      expect_actions_executor_runs([proc do |actions, timeout: nil, concurrent: false, log_to_dir: 'run_logs', log_to_stdout: true|
+      expect_actions_executor_runs([proc do |actions|
         expect(actions).to eq(['node1'] => [{ interactive: true }])
         { 'node1' => [0, '', ''] }
       end])

data/spec/hybrid_platforms_conductor_test/executables/ssh_config_spec.rb

@@ -3,31 +3,29 @@ describe 'ssh_config executable' do
   # Setup a platform for ssh_config tests
   #
   # Parameters::
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_ssh_config
-    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_ssh_config(&block)
+    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {} } }, &block)
   end
 
   it 'dumps the SSH config without arguments' do
     with_test_platform_for_ssh_config do
-      expect(test_actions_executor.connector(:ssh)).to receive(:ssh_config).with(ssh_exec: 'ssh') { '# SSH config' }
+      expect(test_actions_executor.connector(:ssh)).to receive(:ssh_config).with(ssh_exec: 'ssh').and_return('# SSH config')
       exit_code, stdout, stderr = run 'ssh_config'
       expect(exit_code).to eq 0
-      expect(stdout).to match /# SSH config/
+      expect(stdout).to match(/# SSH config/)
       expect(stderr).to eq ''
     end
   end
 
   it 'dumps the SSH config with an alternate SSH executable' do
     with_test_platform_for_ssh_config do
-      expect(test_actions_executor.connector(:ssh)).to receive(:ssh_config).with(ssh_exec: 'my_ssh') { '# SSH config' }
+      expect(test_actions_executor.connector(:ssh)).to receive(:ssh_config).with(ssh_exec: 'my_ssh').and_return('# SSH config')
       exit_code, stdout, stderr = run 'ssh_config', '--ssh-exec', 'my_ssh'
       expect(exit_code).to eq 0
-      expect(stdout).to match /# SSH config/
+      expect(stdout).to match(/# SSH config/)
       expect(stderr).to eq ''
     end
   end

data/spec/hybrid_platforms_conductor_test/executables/test_spec.rb

@@ -3,13 +3,11 @@ describe 'test executable' do
   # Setup a platform for test tests
   #
   # Parameters::
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_test
-    with_test_platform({ nodes: { 'node' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_test(&block)
+    with_test_platform({ nodes: { 'node' => {} } }, &block)
   end
 
   it 'executes a given test on a given node' do

data/spec/hybrid_platforms_conductor_test/helpers/actions_executor_helpers.rb

@@ -58,7 +58,7 @@ module HybridPlatformsConductorTest
       def with_connections_mocked_on(expected_nodes)
         expect(test_actions_executor).to receive(:with_connections_prepared_to) do |nodes, no_exception: false, &client_code|
           expect(nodes.sort).to eq expected_nodes.sort
-          client_code.call Hash[nodes.map { |node| [node, test_actions_executor.connector(:test_connector)] }]
+          client_code.call nodes.map { |node| [node, test_actions_executor.connector(:test_connector)] }.to_h
         end
         yield
       end
@@ -87,7 +87,7 @@ module HybridPlatformsConductorTest
       # Result::
       # * ActionsExecutor: ActionsExecutor on which we can do testing
       def test_actions_executor
-        @actions_executor = HybridPlatformsConductor::ActionsExecutor.new logger: logger, logger_stderr: logger, config: test_config, cmd_runner: test_cmd_runner, nodes_handler: test_nodes_handler unless @actions_executor
+        @actions_executor ||= HybridPlatformsConductor::ActionsExecutor.new logger: logger, logger_stderr: logger, config: test_config, cmd_runner: test_cmd_runner, nodes_handler: test_nodes_handler
         @actions_executor
       end
 

data/spec/hybrid_platforms_conductor_test/helpers/cmd_runner_helpers.rb

@@ -38,6 +38,7 @@ module HybridPlatformsConductorTest
           remaining_expected_commands_mutex.synchronize do
             remaining_expected_commands.delete_if do |(expected_command, command_code, _options)|
               break unless found_command.nil?
+
               if (expected_command.is_a?(String) && expected_command == cmd) || (expected_command.is_a?(Regexp) && cmd =~ expected_command)
                 found_command = expected_command
                 found_command_code = command_code
@@ -86,8 +87,8 @@ module HybridPlatformsConductorTest
         end
         yield
         expect(
-          remaining_expected_commands.select do |(_expected_command, _command_code, options)|
-            !options[:optional]
+          remaining_expected_commands.reject do |(_expected_command, _command_code, options)|
+            options[:optional]
           end
         ).to eq([]), "Expected CmdRunner commands were not run:\n#{
           remaining_expected_commands.map do |(expected_command, _command_code, options)|
@@ -103,7 +104,7 @@ module HybridPlatformsConductorTest
       # Result::
       # * CmdRunner: CmdRunner on which we can do testing
       def test_cmd_runner
-        @cmd_runner = HybridPlatformsConductor::CmdRunner.new logger: logger, logger_stderr: logger unless @cmd_runner
+        @cmd_runner ||= HybridPlatformsConductor::CmdRunner.new logger: logger, logger_stderr: logger
         @cmd_runner
       end