hybrid_platforms_conductor 32.8.1 → 32.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d9219641c19413d2e3a3eda578ab316036e4d2ea4825b27f398a66988fecc2c
-  data.tar.gz: 266d4ffd061d31e0c98eb29b7978b3eab070e282070300c49d66a09653637f50
+  metadata.gz: f190c223603682dd67a933cb989ef89858d71459ebb1d962bfffda9def7666f2
+  data.tar.gz: 4fd85a4b961dc8ba8cc2c83b3f9749b49a021203c37afbe91db5123e54068007
 SHA512:
-  metadata.gz: faf29c55e2f6d2938bdea2dd032558afd064a3be227a7aab4aa4e16ff9246e604795500e2adf9ba0847163c9e20931652e5545d68f82d4e96fcc2272e16b1bf1
-  data.tar.gz: dffe1ae884488901cce794c3c7be1237ea8a4832658dfa6a839fad0a19eeee17e7e3d7c5b0849381ffd2ae4a55e790a875b295f92bdf317d5f960ee5de60223a
+  metadata.gz: e77c67013ea488956dd55927a06b22733efc7f283aa234bd3527b02a8044517447177a686c4964e27c7ff62afd9513de34efe33321ee6fdb16f7e3d6cd0dd06c
+  data.tar.gz: 0e041f3b998df727e83ec6580b09a02e4ee22c246e23a2f7ef5e3b64a3d60fd39745c1ed2241846467c14ba9d11b6dc8e8955929b6940f7ef87132369ecc9c80

data/lib/hybrid_platforms_conductor/tests_runner.rb

@@ -428,9 +428,11 @@ module HybridPlatformsConductor
             end
           end
           # Compute the timeout that will be applied, from the max timeout sum for every node that has tests to run
-          timeout = CONNECTION_TIMEOUT + @cmds_to_run.map do |_node, cmds_list|
-            cmds_list.inject(0) { |total_timeout, (_cmd, test_info)| test_info[:timeout] + total_timeout }
-          end.max
+          timeout = CONNECTION_TIMEOUT + (
+            @cmds_to_run.map do |_node, cmds_list|
+              cmds_list.inject(0) { |total_timeout, (_cmd, test_info)| test_info[:timeout] + total_timeout }
+            end.max || 0
+          )
           # Run commands on nodes, in grouped way to avoid too many connections, per node
           # Hash< String, Array<String> >
           @test_cmds = Hash[@cmds_to_run.map do |node, cmds_list|
@@ -464,33 +466,35 @@ module HybridPlatformsConductor
         end,
         test_execution: proc do |test|
           exit_status, stdout, stderr = @actions_result[test.node]
-          if exit_status.is_a?(Symbol)
-            test.error "Error while executing tests: #{exit_status}: #{stderr}"
-          else
-            log_debug <<~EOS
-              ----- Commands for #{test.node}:
-              #{@test_cmds[test.node][:remote_bash].join("\n")}
-              ----- STDOUT:
-              #{stdout}
-              ----- STDERR:
-              #{stderr}
-              -----
-            EOS
-            # Skip the first section, as it can contain SSH banners
-            cmd_stdouts = stdout.split("#{CMD_SEPARATOR}\n")[1..-1]
-            cmd_stdouts = [] if cmd_stdouts.nil?
-            cmd_stderrs = stderr.split("#{CMD_SEPARATOR}\n")[1..-1]
-            cmd_stderrs = [] if cmd_stderrs.nil?
-            @cmds_to_run[test.node].zip(cmd_stdouts, cmd_stderrs).each do |(cmd, test_info), cmd_stdout, cmd_stderr|
-              # Find the section that corresponds to this test
-              if test_info[:test] == test
-                cmd_stdout = '' if cmd_stdout.nil?
-                cmd_stderr = '' if cmd_stderr.nil?
-                stdout_lines = cmd_stdout.split("\n")
-                # Last line of stdout is the return code
-                return_code = stdout_lines.empty? ? :command_cant_run : Integer(stdout_lines.last)
-                test.error "Command '#{cmd}' returned error code #{return_code}", "----- STDOUT:\n#{stdout_lines[0..-2].join("\n")}\n----- STDERR:\n#{cmd_stderr}" unless return_code == 0
-                test_info[:validator].call(stdout_lines[0..-2], cmd_stderr.split("\n"), return_code)
+          unless exit_status.nil?
+            if exit_status.is_a?(Symbol)
+              test.error "Error while executing tests: #{exit_status}: #{stderr}"
+            else
+              log_debug <<~EOS
+                ----- Commands for #{test.node}:
+                #{@test_cmds[test.node][:remote_bash].join("\n")}
+                ----- STDOUT:
+                #{stdout}
+                ----- STDERR:
+                #{stderr}
+                -----
+              EOS
+              # Skip the first section, as it can contain SSH banners
+              cmd_stdouts = stdout.split("#{CMD_SEPARATOR}\n")[1..-1]
+              cmd_stdouts = [] if cmd_stdouts.nil?
+              cmd_stderrs = stderr.split("#{CMD_SEPARATOR}\n")[1..-1]
+              cmd_stderrs = [] if cmd_stderrs.nil?
+              @cmds_to_run[test.node].zip(cmd_stdouts, cmd_stderrs).each do |(cmd, test_info), cmd_stdout, cmd_stderr|
+                # Find the section that corresponds to this test
+                if test_info[:test] == test
+                  cmd_stdout = '' if cmd_stdout.nil?
+                  cmd_stderr = '' if cmd_stderr.nil?
+                  stdout_lines = cmd_stdout.split("\n")
+                  # Last line of stdout is the return code
+                  return_code = stdout_lines.empty? ? :command_cant_run : Integer(stdout_lines.last)
+                  test.error "Command '#{cmd}' returned error code #{return_code}", "----- STDOUT:\n#{stdout_lines[0..-2].join("\n")}\n----- STDERR:\n#{cmd_stderr}" unless return_code == 0
+                  test_info[:validator].call(stdout_lines[0..-2], cmd_stderr.split("\n"), return_code)
+                end
               end
             end
           end

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '32.8.1'
+  VERSION = '32.8.2'
 
 end

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

@@ -69,7 +69,7 @@ describe HybridPlatformsConductor::TestsRunner do
           'node12' => { 'test_node12.sh' => proc { |stdout, stderr, exit_code| ssh_executions << ['node12', stdout, stderr, exit_code] } },
           'node21' => { 'test_node21.sh' => proc { |stdout, stderr, exit_code| ssh_executions << ['node21', stdout, stderr, exit_code] } },
           'node22' => { 'test_node22.sh' => proc { |stdout, stderr, exit_code| ssh_executions << ['node22', stdout, stderr, exit_code] } }
-        }}
+        } }
         expect(test_tests_runner.run_tests([{ all: true }])).to eq 0
         expect(ssh_executions.sort).to eq [
           ['node11', ['stdout11'], ['stderr11'], 0],
@@ -88,7 +88,7 @@ describe HybridPlatformsConductor::TestsRunner do
         HybridPlatformsConductorTest::TestPlugins::NodeSsh.node_tests = { node_ssh_test: {
           'node12' => { 'test_node12.sh' => proc { |stdout, stderr, exit_code| ssh_executions << ['node12', stdout, stderr, exit_code] } },
           'node22' => { 'test_node22.sh' => proc { |stdout, stderr, exit_code| ssh_executions << ['node22', stdout, stderr, exit_code] } }
-        }}
+        } }
         expect(test_tests_runner.run_tests(%w[node12 node22])).to eq 0
         expect(ssh_executions.sort).to eq [
           ['node12', ['stdout12'], ['stderr12'], 0],
@@ -97,6 +97,19 @@ describe HybridPlatformsConductor::TestsRunner do
       end
     end
 
+    it 'does not execute anything when the tests report no command' do
+      with_test_platform_for_node_connection_tests do
+        test_tests_runner.tests = [:node_ssh_test]
+        ssh_executions = []
+        HybridPlatformsConductorTest::TestPlugins::NodeSsh.node_tests = { node_ssh_test: {
+          'node12' => {},
+          'node22' => {}
+        } }
+        expect(test_tests_runner.run_tests(%w[node12 node22])).to eq 0
+        expect(ssh_executions).to eq []
+      end
+    end
+
     it 'executes several SSH node tests once per node with the correct command, grouping commands' do
       with_test_platform_for_node_connection_tests do
         expect_actions_executor_runs([proc do |actions|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 32.8.1
+  version: 32.8.2
 platform: ruby
 authors:
 - Muriel Salvan