hybrid_platforms_conductor 33.0.0 → 33.0.1

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

@@ -3,18 +3,16 @@ describe 'executables\' Actions Executor options' do
   # Setup a platform for 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_actions_executor_options
-    with_test_platform({ nodes: { 'node' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_actions_executor_options(&block)
+    with_test_platform({ nodes: { 'node' => {} } }, &block)
   end
 
   it 'drives the maximum number of threads' do
     with_test_platform_for_actions_executor_options 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
         expect(test_actions_executor.max_threads).to eq 5
         {}
       end])

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

@@ -3,13 +3,11 @@ describe 'executables\' Cmd Runner options' do
   # Setup a platform for 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_cmd_runner_options
-    with_test_platform({ nodes: { 'node' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_cmd_runner_options(&block)
+    with_test_platform({ nodes: { 'node' => {} } }, &block)
   end
 
   it 'displays commands instead of running them' do

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

@@ -3,20 +3,19 @@ describe 'executables\' common options' do
   # Setup a platform for 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_common_options
+  def with_test_platform_for_common_options(&block)
     with_test_platform(
       {
         nodes: { 'node1' => { meta: { host_ip: '192.168.42.42' }, services: ['node1_service'] } },
         deployable_services: %w[node1_service]
       },
-      true,
-      'send_logs_to :test_log'
-    ) do |repository|
-      yield repository
-    end
+      as_git: true,
+      additional_config: 'send_logs_to :test_log',
+      &block
+    )
   end
 
   # List of executables for which we test the common options, along with options to try that should do nothing
@@ -42,14 +41,14 @@ describe 'executables\' common options' do
         with_test_platform_for_common_options do
           exit_code, stdout, stderr = run executable, '--help'
           expect(exit_code).to eq 0
-          expect(stdout).to match /Usage: .*#{executable}/
+          expect(stdout).to match(/Usage: .*#{Regexp.escape(executable)}/)
           expect(stderr).to eq ''
         end
       end
 
       it 'accepts the debug mode switch' do
         with_test_platform_for_common_options do
-          exit_code, stdout, stderr = run executable, *(['--debug'] + default_options)
+          exit_code, _stdout, stderr = run executable, *(['--debug'] + default_options)
           expect(exit_code).to eq 0
           # Make sure to ignore the deployment markers from stderr.
           expect(stderr.gsub("===== [ node1 / node1_service ] - HPC Service Check ===== Begin\n===== [ node1 / node1_service ] - HPC Service Check ===== End\n", '')).to eq ''

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

@@ -3,64 +3,62 @@ describe 'executables\' Deployer options' do
   # Setup a platform for 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_deployer_options
-    with_test_platform({ nodes: { 'node' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_deployer_options(&block)
+    with_test_platform({ nodes: { 'node' => {} } }, &block)
   end
 
   it 'uses parallel mode' do
-    with_test_platform_for_deployer_options do |repository|
+    with_test_platform_for_deployer_options do
       expect(test_deployer).to receive(:deploy_on).with(['node']) do
         expect(test_deployer.concurrent_execution).to eq true
         {}
       end
-      exit_code, stdout, stderr = run 'deploy', '--node', 'node', '--parallel'
+      exit_code, _stdout, stderr = run 'deploy', '--node', 'node', '--parallel'
       expect(exit_code).to eq 0
       expect(stderr).to eq ''
     end
   end
 
   it 'uses why-run' do
-    with_test_platform_for_deployer_options do |repository|
+    with_test_platform_for_deployer_options do
       expect(test_deployer).to receive(:deploy_on).with(['node']) do
         expect(test_deployer.use_why_run).to eq true
         {}
       end
-      exit_code, stdout, stderr = run 'deploy', '--node', 'node', '--why-run'
+      exit_code, _stdout, stderr = run 'deploy', '--node', 'node', '--why-run'
       expect(exit_code).to eq 0
       expect(stderr).to eq ''
     end
   end
 
   it 'uses timeout with why-run' do
-    with_test_platform_for_deployer_options do |repository|
+    with_test_platform_for_deployer_options do
       expect(test_deployer).to receive(:deploy_on).with(['node']) do
         expect(test_deployer.timeout).to eq 5
         {}
       end
-      exit_code, stdout, stderr = run 'deploy', '--node', 'node', '--why-run', '--timeout', '5'
+      exit_code, _stdout, stderr = run 'deploy', '--node', 'node', '--why-run', '--timeout', '5'
       expect(exit_code).to eq 0
       expect(stderr).to eq ''
     end
   end
 
   it 'fails to use timeout without why-run' do
-    with_test_platform_for_deployer_options do |repository|
+    with_test_platform_for_deployer_options do
       expect { run 'deploy', '--node', 'node', '--timeout', '5' }.to raise_error(RuntimeError, 'Can\'t have a timeout unless why-run mode. Please don\'t use --timeout without --why-run.')
     end
   end
 
   it 'uses retries on errors' do
-    with_test_platform_for_deployer_options do |repository|
+    with_test_platform_for_deployer_options do
       expect(test_deployer).to receive(:deploy_on).with(['node']) do
         expect(test_deployer.nbr_retries_on_error).to eq 42
         {}
       end
-      exit_code, stdout, stderr = run 'deploy', '--node', 'node', '--retries-on-error', '42'
+      exit_code, _stdout, stderr = run 'deploy', '--node', 'node', '--retries-on-error', '42'
       expect(exit_code).to eq 0
       expect(stderr).to eq ''
     end

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

@@ -3,10 +3,10 @@ describe 'executables\' Nodes Handler options' do
   # Setup a platform for 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_nodes_handler_options
+  def with_test_platform_for_nodes_handler_options(&block)
     with_test_platforms(
       {
         'platform_1' => {
@@ -41,13 +41,13 @@ describe 'executables\' Nodes Handler options' do
               }
             }
           },
-          nodes_lists: { 'my_list' => ['node11', 'node13'] }
+          nodes_lists: { 'my_list' => %w[node11 node13] }
         },
         'platform_2' => {
           nodes: {
             'node21' => {
               meta: { host_ip: '192.168.42.21' },
-              services: ['service2', 'service3']
+              services: %w[service2 service3]
             },
             'node22' => {
               meta: { host_ip: '192.168.42.22' },
@@ -55,10 +55,9 @@ describe 'executables\' Nodes Handler options' do
             }
           }
         }
-      }
-    ) do |repository|
-      yield repository
-    end
+      },
+      &block
+    )
   end
 
   it 'displays info about nodes' do
@@ -69,7 +68,7 @@ describe 'executables\' Nodes Handler options' do
       ] do
         exit_code, stdout, stderr = run 'run', '--show-nodes'
         expect(exit_code).to eq 0
-        expect(stdout).to eq <<~EOS
+        expect(stdout).to eq <<~EO_STDOUT
           * Known platforms:
           platform_1 - Type: test - Location: /tmp/hpc_test/platform_1
           platform_2 - Type: test - Location: /tmp/hpc_test/platform_2
@@ -102,7 +101,7 @@ describe 'executables\' Nodes Handler options' do
           node21 (192.168.42.21) - service2, service3 - 
           node22 (192.168.42.22) - service1 - 
 
-        EOS
+        EO_STDOUT
         expect(stderr).to eq ''
       end
     end

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

@@ -3,19 +3,19 @@ describe 'executables\' nodes selection options' do
   # Setup a platform for 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_nodes_selector_options
+  def with_test_platform_for_nodes_selector_options(&block)
     with_test_platforms(
       {
         'platform_1' => {
           nodes: {
             'node11' => { services: ['service1'] },
-            'node12' => { services: ['service3', 'service1'] },
+            'node12' => { services: %w[service3 service1] },
             'node13' => { services: ['service2'] }
           },
-          nodes_lists: { 'my_list' => ['node11', 'node13'] }
+          nodes_lists: { 'my_list' => %w[node11 node13] }
         },
         'platform_2' => {
           nodes: {
@@ -23,10 +23,9 @@ describe 'executables\' nodes selection options' do
             'node22' => { services: ['service1'] }
           }
         }
-      }
-    ) do |repository|
-      yield repository
-    end
+      },
+      &block
+    )
   end
 
   # Enumerate all command-line selectors to test, and the corresponding nodes list
@@ -59,8 +58,8 @@ describe 'executables\' nodes selection options' do
 
     it "resolves '#{args.join(' ')}' into #{expected_nodes.join(', ')}" do
       with_test_platform_for_nodes_selector_options do
-        expect(test_deployer).to receive(:deploy_on).with(expected_nodes) { {} }
-        exit_code, stdout, stderr = run 'deploy', *args
+        expect(test_deployer).to receive(:deploy_on).with(expected_nodes).and_return({})
+        exit_code, _stdout, stderr = run 'deploy', *args
         expect(exit_code).to eq 0
         expect(stderr).to eq ''
       end

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