hybrid_platforms_conductor 33.0.0 → 33.0.1

data/spec/hybrid_platforms_conductor_test/api/tests_runner/platform_spec.rb

@@ -1,6 +1,6 @@
 describe HybridPlatformsConductor::TestsRunner do
 
-  context 'checking platform tests execution' do
+  context 'when checking platform tests execution' do
 
     # Prepare the test platform with test plugins
     #
@@ -8,10 +8,13 @@ describe HybridPlatformsConductor::TestsRunner do
     # * Proc: Code called with the platform setup
     def with_test_platform_for_platform_tests
       with_test_platforms(
-        'platform1' => { nodes: { 'node11' => {}, 'node12' => {}, 'node13' => {} } },
-        'platform2' => { nodes: { 'node21' => {}, 'node22' => {}, 'node23' => {} }, platform_type: :test2 }
+        {
+          'platform1' => { nodes: { 'node11' => {}, 'node12' => {}, 'node13' => {} } },
+          'platform2' => { nodes: { 'node21' => {}, 'node22' => {}, 'node23' => {} }, platform_type: :test_2 }
+        }
       ) do
-        register_test_plugins(test_tests_runner,
+        register_test_plugins(
+          test_tests_runner,
           platform_test: HybridPlatformsConductorTest::TestPlugins::Platform,
           platform_test_2: HybridPlatformsConductorTest::TestPlugins::Platform
         )
@@ -29,7 +32,7 @@ describe HybridPlatformsConductor::TestsRunner do
 
     it 'executes several platform tests' do
       with_test_platform_for_platform_tests do
-        test_tests_runner.tests = [:platform_test, :platform_test_2]
+        test_tests_runner.tests = %i[platform_test platform_test_2]
         expect(test_tests_runner.run_tests([{ all: true }])).to eq 0
         expect(HybridPlatformsConductorTest::TestPlugins::Platform.runs.sort).to eq [
           [:platform_test, 'platform1'],
@@ -42,8 +45,8 @@ describe HybridPlatformsConductor::TestsRunner do
 
     it 'executes platform tests only on valid platform types' do
       with_test_platform_for_platform_tests do
-        test_tests_runner.tests = [:platform_test, :platform_test_2]
-        HybridPlatformsConductorTest::TestPlugins::Platform.only_on_platform_types = %i[test2]
+        test_tests_runner.tests = %i[platform_test platform_test_2]
+        HybridPlatformsConductorTest::TestPlugins::Platform.only_on_platform_types = %i[test_2]
         expect(test_tests_runner.run_tests([{ all: true }])).to eq 0
         expect(HybridPlatformsConductorTest::TestPlugins::Platform.runs.sort).to eq [
           [:platform_test, 'platform2'],
@@ -54,7 +57,7 @@ describe HybridPlatformsConductor::TestsRunner do
 
     it 'executes several platform tests in parallel' do
       with_test_platform_for_platform_tests do
-        test_tests_runner.tests = [:platform_test, :platform_test_2]
+        test_tests_runner.tests = %i[platform_test platform_test_2]
         test_tests_runner.max_threads_platforms = 4
         HybridPlatformsConductorTest::TestPlugins::Platform.sleeps = {
           platform_test: {
@@ -78,7 +81,7 @@ describe HybridPlatformsConductor::TestsRunner do
 
     it 'executes several platform tests in parallel with a limited number of threads' do
       with_test_platform_for_platform_tests do
-        test_tests_runner.tests = [:platform_test, :platform_test_2]
+        test_tests_runner.tests = %i[platform_test platform_test_2]
         test_tests_runner.max_threads_platforms = 2
         HybridPlatformsConductorTest::TestPlugins::Platform.sleeps = {
           platform_test: {

data/spec/hybrid_platforms_conductor_test/api/tests_runner/reports_spec.rb

@@ -1,6 +1,6 @@
 describe HybridPlatformsConductor::TestsRunner do
 
-  context 'checking reporting results of tests execution' do
+  context 'when checking reporting results of tests execution' do
 
     # Setup a tests platform for the reports testing
     #
@@ -8,19 +8,24 @@ describe HybridPlatformsConductor::TestsRunner do
     # * Proc: Code called with the platform setup
     def with_test_platforms_for_reports_test
       with_test_platforms(
-        'platform1' => { nodes: { 'node11' => {}, 'node12' => {} } },
-        'platform2' => { nodes: { 'node21' => {}, 'node22' => {} } }
+        {
+          'platform1' => { nodes: { 'node11' => {}, 'node12' => {} } },
+          'platform2' => { nodes: { 'node21' => {}, 'node22' => {} } }
+        }
       ) do
         register_tests_report_plugins(test_tests_runner, report: HybridPlatformsConductorTest::TestsReportPlugin)
-        register_test_plugins(test_tests_runner, {
-          global_test: HybridPlatformsConductorTest::TestPlugins::Global,
-          platform_test: HybridPlatformsConductorTest::TestPlugins::Platform,
-          node_test: HybridPlatformsConductorTest::TestPlugins::Node,
-          node_test_2: HybridPlatformsConductorTest::TestPlugins::Node,
-          node_ssh_test: HybridPlatformsConductorTest::TestPlugins::NodeSsh,
-          node_check_test: HybridPlatformsConductorTest::TestPlugins::NodeCheck,
-          several_tests: HybridPlatformsConductorTest::TestPlugins::SeveralChecks
-        })
+        register_test_plugins(
+          test_tests_runner,
+          {
+            global_test: HybridPlatformsConductorTest::TestPlugins::Global,
+            platform_test: HybridPlatformsConductorTest::TestPlugins::Platform,
+            node_test: HybridPlatformsConductorTest::TestPlugins::Node,
+            node_test_2: HybridPlatformsConductorTest::TestPlugins::Node,
+            node_ssh_test: HybridPlatformsConductorTest::TestPlugins::NodeSsh,
+            node_check_test: HybridPlatformsConductorTest::TestPlugins::NodeCheck,
+            several_tests: HybridPlatformsConductorTest::TestPlugins::SeveralChecks
+          }
+        )
         test_tests_runner.reports = [:report]
         yield
       end
@@ -110,7 +115,7 @@ describe HybridPlatformsConductor::TestsRunner do
           'node12' => { 'test_node12.sh' => proc {} },
           'node21' => { 'test_node21.sh' => proc {} },
           'node22' => { 'test_node22.sh' => proc {} }
-        }}
+        } }
         expect_actions_executor_runs([proc do
           {
             'node11' => [0, "===== TEST COMMAND EXECUTION ===== Separator generated by Hybrid Platforms Conductor test framework =====\n0\n", ''],
@@ -138,7 +143,7 @@ describe HybridPlatformsConductor::TestsRunner do
           'node12' => { 'test_node12.sh' => proc {} },
           'node21' => { 'test_node21.sh' => proc {} },
           'node22' => { 'test_node22.sh' => proc {} }
-        }}
+        } }
         expect_actions_executor_runs([proc do
           {
             'node11' => [0, "===== TEST COMMAND EXECUTION ===== Separator generated by Hybrid Platforms Conductor test framework =====\n0\n", ''],
@@ -161,14 +166,12 @@ describe HybridPlatformsConductor::TestsRunner do
 
     it 'reports correctly a node check test' do
       with_test_platforms_for_reports_test do
-        expect(test_deployer).to receive(:deploy_on).with(%w[node11 node12 node21 node22]).once do
-          {
-            'node11' => [0, 'node11 check ok', ''],
-            'node12' => [0, 'node12 check ok', ''],
-            'node21' => [0, 'node21 check ok', ''],
-            'node22' => [0, 'node22 check ok', '']
-          }
-        end
+        expect(test_deployer).to receive(:deploy_on).with(%w[node11 node12 node21 node22]).once.and_return(
+          'node11' => [0, 'node11 check ok', ''],
+          'node12' => [0, 'node12 check ok', ''],
+          'node21' => [0, 'node21 check ok', ''],
+          'node22' => [0, 'node22 check ok', '']
+        )
         test_tests_runner.tests = [:node_check_test]
         test_tests_runner.run_tests [{ all: true }]
         expect(HybridPlatformsConductorTest::TestsReportPlugin.reports.size).to eq 1
@@ -183,14 +186,12 @@ describe HybridPlatformsConductor::TestsRunner do
 
     it 'reports correctly a node check test that is failing' do
       with_test_platforms_for_reports_test do
-        expect(test_deployer).to receive(:deploy_on).with(%w[node11 node12 node21 node22]).once do
-          {
-            'node11' => [0, 'node11 check ok', ''],
-            'node12' => [1, 'node12 check ok', 'Error for node12'],
-            'node21' => [2, 'node21 check ok', 'Error for node21'],
-            'node22' => [0, 'node22 check ok', '']
-          }
-        end
+        expect(test_deployer).to receive(:deploy_on).with(%w[node11 node12 node21 node22]).once.and_return(
+          'node11' => [0, 'node11 check ok', ''],
+          'node12' => [1, 'node12 check ok', 'Error for node12'],
+          'node21' => [2, 'node21 check ok', 'Error for node21'],
+          'node22' => [0, 'node22 check ok', '']
+        )
         test_tests_runner.tests = [:node_check_test]
         test_tests_runner.run_tests [{ all: true }]
         expect(HybridPlatformsConductorTest::TestsReportPlugin.reports.size).to eq 1
@@ -229,23 +230,23 @@ describe HybridPlatformsConductor::TestsRunner do
               'echo "$?"'
             ]
           end
-          Hash[node_suffixes.map do |node_suffix|
+          node_suffixes.map do |node_suffix|
             [
               "node#{node_suffix}",
               [
                 0,
-                <<~EOS,
+                <<~EO_STDOUT,
                   ===== TEST COMMAND EXECUTION ===== Separator generated by Hybrid Platforms Conductor test framework =====
                   stdout#{node_suffix}
                   0
-                EOS
-                <<~EOS
+                EO_STDOUT
+                <<~EO_STDERR
                   ===== TEST COMMAND EXECUTION ===== Separator generated by Hybrid Platforms Conductor test framework =====
                   stderr#{node_suffix}
-                EOS
+                EO_STDERR
               ]
             ]
-          end]
+          end.to_h
         end])
         # Run everything
         test_tests_runner.tests = [:several_tests]
@@ -279,7 +280,7 @@ describe HybridPlatformsConductor::TestsRunner do
 
     it 'groups errors correctly by their attributes' do
       with_test_platforms_for_reports_test do
-        test_tests_runner.tests = [:node_test, :node_test_2]
+        test_tests_runner.tests = %i[node_test node_test_2]
         HybridPlatformsConductorTest::TestPlugins::Node.fail_for = {
           node_test: %w[node12 node22],
           node_test_2: %w[node21 node22]
@@ -308,12 +309,11 @@ describe HybridPlatformsConductor::TestsRunner do
             'nodes_list2' => %w[node2 node3 node4]
           }
         },
-        false,
-        '
-        for_nodes(\'node1\') do
-          expect_tests_to_fail(:node_test, \'Expected failure\')
-        end
-        '
+        additional_config: <<~'EO_CONFIG'
+          for_nodes('node1') do
+            expect_tests_to_fail(:node_test, 'Expected failure')
+          end
+        EO_CONFIG
       ) do
         register_tests_report_plugins(test_tests_runner, report: HybridPlatformsConductorTest::TestsReportPlugin)
         register_test_plugins(test_tests_runner, node_test: HybridPlatformsConductorTest::TestPlugins::Node)
@@ -345,11 +345,12 @@ describe HybridPlatformsConductor::TestsRunner do
 
     it 'can report on several reports' do
       with_test_platforms_for_reports_test do
-        register_tests_report_plugins(test_tests_runner,
-          report1: HybridPlatformsConductorTest::TestsReportPlugin,
-          report2: HybridPlatformsConductorTest::TestsReportPlugin
+        register_tests_report_plugins(
+          test_tests_runner,
+          report_1: HybridPlatformsConductorTest::TestsReportPlugin,
+          report_2: HybridPlatformsConductorTest::TestsReportPlugin
         )
-        test_tests_runner.reports = %i[report1 report2]
+        test_tests_runner.reports = %i[report_1 report_2]
         test_tests_runner.tests = [:global_test]
         test_tests_runner.run_tests [{ all: true }]
         expect(HybridPlatformsConductorTest::TestsReportPlugin.reports.size).to eq 2

data/spec/hybrid_platforms_conductor_test/api/tests_runner/test_plugins/bitbucket_conf_spec.rb

@@ -1,12 +1,12 @@
 describe HybridPlatformsConductor::TestsRunner do
 
-  context 'checking test plugins' do
+  context 'when checking test plugins' do
 
-    context 'checking bitbucket_conf' do
+    context 'with bitbucket_conf' do
 
       it 'iterates over defined Bitbucket repos' do
-        with_repository do |repository|
-          platforms = <<~EOS
+        with_repository do
+          platforms = <<~EO_CONFIG
             bitbucket_repos(
               url: 'https://my_bb1.my_domain.com',
               project: 'PR1',
@@ -33,7 +33,7 @@ describe HybridPlatformsConductor::TestsRunner do
                 ]
               }
             )
-          EOS
+          EO_CONFIG
           with_platforms platforms do
             repos = []
             test_config.for_each_bitbucket_repo do |bitbucket, repo_info|

data/spec/hybrid_platforms_conductor_test/api/tests_runner/test_plugins/github_ci_spec.rb

@@ -1,12 +1,12 @@
 describe HybridPlatformsConductor::TestsRunner do
 
-  context 'checking test plugins' do
+  context 'when checking test plugins' do
 
-    context 'checking github_ci' do
+    context 'with github_ci' do
 
       it 'iterates over defined Github repos' do
-        with_repository do |repository|
-          platforms = <<~EOS
+        with_repository do
+          platforms = <<~EO_CONFIG
             github_repos(
               url: 'https://my_gh.my_domain.com',
               user: 'GH-User1',
@@ -22,7 +22,7 @@ describe HybridPlatformsConductor::TestsRunner do
                 'repo4'
               ]
             )
-          EOS
+          EO_CONFIG
           with_platforms platforms do
             repos = []
             test_config.for_each_github_repo do |github, repo_info|

data/spec/hybrid_platforms_conductor_test/api/tests_runner/test_reports_plugins/confluence_spec.rb

@@ -1,17 +1,17 @@
 describe HybridPlatformsConductor::TestsRunner do
 
-  context 'checking test reports plugins' do
+  context 'when checking test reports plugins' do
 
-    context 'checking confluence' do
+    context 'with confluence' do
 
       it 'returns Confluence info' do
-        with_repository do |repository|
-          platforms = <<~EOS
+        with_repository do
+          platforms = <<~EO_CONFIG
             confluence(
               url: 'https://my_confluence.my_domain.com',
               inventory_report_page_id: '123456'
             )
-          EOS
+          EO_CONFIG
           with_platforms platforms do
             expect(test_config.confluence_info).to eq(
               url: 'https://my_confluence.my_domain.com',

data/spec/hybrid_platforms_conductor_test/cmdb_plugins/test_cmdb.rb

@@ -40,7 +40,7 @@ module HybridPlatformsConductorTest
       #     Nodes for which the property can't be fetched can be ommitted.
       def get_upcase(nodes, metadata)
         record_call(:get_upcase, nodes, metadata)
-        Hash[nodes.map { |node| [node, node.upcase] }]
+        nodes.map { |node| [node, node.upcase] }.to_h
       end
 
       # Get a specific property for a given set of nodes.
@@ -55,7 +55,7 @@ module HybridPlatformsConductorTest
       #     Nodes for which the property can't be fetched can be ommitted.
       def get_double(nodes, metadata)
         record_call(:get_double, nodes, metadata)
-        Hash[nodes.map { |node| [node, node * 2] }]
+        nodes.map { |node| [node, node * 2] }.to_h
       end
 
       # Get a specific property for a given set of nodes.
@@ -70,7 +70,7 @@ module HybridPlatformsConductorTest
       #     Nodes for which the property can't be fetched can be ommitted.
       def get_reversed_double(nodes, metadata)
         record_call(:get_reversed_double, nodes, metadata)
-        Hash[nodes.map { |node| [node, metadata[node][:double].reverse] }]
+        nodes.map { |node| [node, metadata[node][:double].reverse] }.to_h
       end
 
       # Get a specific property for a given set of nodes.
@@ -85,7 +85,7 @@ module HybridPlatformsConductorTest
       #     Nodes for which the property can't be fetched can be ommitted.
       def get_reversed_downcase(nodes, metadata)
         record_call(:get_reversed_downcase, nodes, metadata)
-        Hash[nodes.map { |node| [node, metadata[node][:downcase] ? metadata[node][:downcase].reverse : 'UNKNOWN'] }]
+        nodes.map { |node| [node, metadata[node][:downcase] ? metadata[node][:downcase].reverse : 'UNKNOWN'] }.to_h
       end
 
       # Get a specific property for a given set of nodes.
@@ -115,7 +115,7 @@ module HybridPlatformsConductorTest
       #     Nodes for which the property can't be fetched can be ommitted.
       def get_same_comment(nodes, metadata)
         record_call(:get_same_comment, nodes, metadata)
-        Hash[nodes.map { |node| [node, "Comment for #{node}"] }]
+        nodes.map { |node| [node, "Comment for #{node}"] }.to_h
       end
 
       # Get a specific property for a given set of nodes.
@@ -130,7 +130,7 @@ module HybridPlatformsConductorTest
       #     Nodes for which the property can't be fetched can be ommitted.
       def get_different_comment(nodes, metadata)
         record_call(:get_different_comment, nodes, metadata)
-        Hash[nodes.map { |node| [node, 'Comment from test_cmdb'] }]
+        nodes.map { |node| [node, 'Comment from test_cmdb'] }.to_h
       end
 
       # Get a specific property for a given set of nodes.
@@ -143,9 +143,9 @@ module HybridPlatformsConductorTest
       # Result::
       # * Hash<String, Object>: The corresponding property, per required node.
       #     Nodes for which the property can't be fetched can be ommitted.
-      def get_different_comment2(nodes, metadata)
-        record_call(:get_different_comment2, nodes, metadata)
-        Hash[nodes.map { |node| [node, 'Comment2 from test_cmdb'] }]
+      def get_different_comment_2(nodes, metadata)
+        record_call(:get_different_comment_2, nodes, metadata)
+        nodes.map { |node| [node, 'Comment2 from test_cmdb'] }.to_h
       end
 
       # Register a call to be checked by the tests later

data/spec/hybrid_platforms_conductor_test/cmdb_plugins/{test_cmdb2.rb → test_cmdb_2.rb}

@@ -27,7 +27,7 @@ module HybridPlatformsConductorTest
       def get_nothing(nodes, metadata)
         record_call(:get_nothing, nodes, metadata)
         # Here we return something to test that if the first one fails we have the second CMDB
-        Hash[nodes.map { |node| [node, "#{node} has nothing"] }]
+        nodes.map { |node| [node, "#{node} has nothing"] }.to_h
       end
 
       # Get a specific property for a given set of nodes.
@@ -42,7 +42,7 @@ module HybridPlatformsConductorTest
       #     Nodes for which the property can't be fetched can be ommitted.
       def get_same_comment(nodes, metadata)
         record_call(:get_same_comment, nodes, metadata)
-        Hash[nodes.map { |node| [node, "Comment for #{node}"] }]
+        nodes.map { |node| [node, "Comment for #{node}"] }.to_h
       end
 
       # Get a specific property for a given set of nodes.
@@ -57,7 +57,7 @@ module HybridPlatformsConductorTest
       #     Nodes for which the property can't be fetched can be ommitted.
       def get_different_comment(nodes, metadata)
         record_call(:get_different_comment, nodes, metadata)
-        Hash[nodes.map { |node| [node, 'Comment from test_cmdb2'] }]
+        nodes.map { |node| [node, 'Comment from test_cmdb_2'] }.to_h
       end
 
       # Get a specific property for a given set of nodes.
@@ -70,9 +70,9 @@ module HybridPlatformsConductorTest
       # Result::
       # * Hash<String, Object>: The corresponding property, per required node.
       #     Nodes for which the property can't be fetched can be ommitted.
-      def get_different_comment2(nodes, metadata)
-        record_call(:get_different_comment2, nodes, metadata)
-        Hash[nodes.map { |node| [node, 'Comment2 from test_cmdb2'] }]
+      def get_different_comment_2(nodes, metadata)
+        record_call(:get_different_comment_2, nodes, metadata)
+        nodes.map { |node| [node, 'Comment2 from test_cmdb_2'] }.to_h
       end
 
       # Register a call to be checked by the tests later

data/spec/hybrid_platforms_conductor_test/cmdb_plugins/test_cmdb_others.rb

@@ -30,16 +30,16 @@ module HybridPlatformsConductorTest
       #     Nodes for which the property can't be fetched can be ommitted.
       def get_others(nodes, metadata)
         record_call(:get_others, nodes, metadata)
-        Hash[nodes.map do |node|
+        nodes.map do |node|
           [
             node,
             {
               downcase: "_#{node}_",
-              last_3: node[-3..-1],
+              last_3: node[-3..],
               nothing: "#{node} has another nothing"
             }
           ]
-        end]
+        end.to_h
       end
 
       # Register a call to be checked by the tests later

data/spec/hybrid_platforms_conductor_test/cmdb_plugins/{test_cmdb_others2.rb → test_cmdb_others_2.rb}

@@ -30,14 +30,14 @@ module HybridPlatformsConductorTest
       #     Nodes for which the property can't be fetched can be ommitted.
       def get_others(nodes, metadata)
         record_call(:get_others, nodes, metadata)
-        Hash[nodes.map do |node|
+        nodes.map do |node|
           [
             node,
             {
               downcase: "__#{node}__"
             }
           ]
-        end]
+        end.to_h
       end
 
       # Register a call to be checked by the tests later