hybrid_platforms_conductor 33.9.4 → 34.0.0

data/lib/hybrid_platforms_conductor/tests_runner.rb

@@ -404,6 +404,8 @@ module HybridPlatformsConductor
     #   String
     CMD_SEPARATOR = '===== TEST COMMAND EXECUTION ===== Separator generated by Hybrid Platforms Conductor test framework ====='
 
+    private_constant :CONNECTION_TIMEOUT, :DEFAULT_CMD_TIMEOUT, :CMD_SEPARATOR
+
     # Run tests that are node specific and require a connection to the node
     def run_tests_connection_on_nodes
       run_tests_on_subjects(
@@ -513,6 +515,7 @@ module HybridPlatformsConductor
     # Timeout in seconds given to a check-node run
     #   Integer
     CHECK_NODE_TIMEOUT = 30 * 60 # 30 minutes
+    private_constant :CHECK_NODE_TIMEOUT
 
     # Run tests that use check-node results
     def run_tests_on_check_nodes

data/lib/hybrid_platforms_conductor/thycotic.rb

@@ -17,7 +17,7 @@ module HybridPlatformsConductor
     # * *domain* (String): Domain to use for authentication to Thycotic [default: ENV['hpc_domain_for_thycotic']]
     # * Proc: Code called with the Thyctotic instance.
     #   * *thycotic* (ThyctoticApi): The Thycotic instance to use.
-    def with_thycotic(thycotic_url, domain: ENV['hpc_domain_for_thycotic'])
+    def with_thycotic(thycotic_url, domain: ENV.fetch('hpc_domain_for_thycotic', nil))
       with_credentials_for(:thycotic, resource: thycotic_url) do |thycotic_user, thycotic_password|
         yield ThycoticApi.new(thycotic_url, thycotic_user, thycotic_password, domain: domain, logger: @logger, logger_stderr: @logger_stderr)
       end
@@ -41,7 +41,7 @@ module HybridPlatformsConductor
         url,
         user,
         password,
-        domain: ENV['hpc_domain_for_thycotic'],
+        domain: ENV.fetch('hpc_domain_for_thycotic', nil),
         logger: Logger.new($stdout),
         logger_stderr: Logger.new($stderr)
       )

data/lib/hybrid_platforms_conductor/topographer.rb

@@ -381,7 +381,7 @@ module HybridPlatformsConductor
         next unless nodes_list.include?(node_name)
 
         new_nodes_graph[node_name] = node_info.merge(
-          connections: node_info[:connections].select { |connected_hostname, _labels| nodes_list.include?(connected_hostname) },
+          connections: node_info[:connections].slice(*nodes_list),
           includes: node_info[:includes] & nodes_list
         )
       end
@@ -398,7 +398,7 @@ module HybridPlatformsConductor
         next if nodes_list.include?(node_name)
 
         new_nodes_graph[node_name] = node_info.merge(
-          connections: node_info[:connections].reject { |connected_hostname, _labels| nodes_list.include?(connected_hostname) },
+          connections: node_info[:connections].except(*nodes_list),
           includes: node_info[:includes] - nodes_list
         )
       end

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '33.9.4'
+  VERSION = '34.0.0'
 
 end

data/spec/hybrid_platforms_conductor_test/api/actions_executor/connectors/ssh/connections_spec.rb

@@ -601,17 +601,10 @@ describe HybridPlatformsConductor::ActionsExecutor do
           ) do
             test_connector.ssh_user = 'test_user'
             # To speed up the test, alter the wait time between retries.
-            old_wait = HybridPlatformsConductor::HpcPlugins::Connector::Ssh.const_get(:WAIT_TIME_FOR_BOOT)
-            begin
-              HybridPlatformsConductor::HpcPlugins::Connector::Ssh.send(:remove_const, :WAIT_TIME_FOR_BOOT)
-              HybridPlatformsConductor::HpcPlugins::Connector::Ssh.const_set(:WAIT_TIME_FOR_BOOT, 1)
-              test_connector.with_connection_to(['node']) do
-              end
-              expect(nbr_boot_messages).to eq 3
-            ensure
-              HybridPlatformsConductor::HpcPlugins::Connector::Ssh.send(:remove_const, :WAIT_TIME_FOR_BOOT)
-              HybridPlatformsConductor::HpcPlugins::Connector::Ssh.const_set(:WAIT_TIME_FOR_BOOT, old_wait)
+            stub_const('HybridPlatformsConductor::HpcPlugins::Connector::Ssh::WAIT_TIME_FOR_BOOT', 1)
+            test_connector.with_connection_to(['node']) do
             end
+            expect(nbr_boot_messages).to eq 3
           end
         end
       end

data/spec/hybrid_platforms_conductor_test/api/actions_executor/connectors/ssh/global_helpers_spec.rb

@@ -57,7 +57,6 @@ describe HybridPlatformsConductor::ActionsExecutor do
             Host *
               User test_user
               ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_ssh_mux_%h_%p_%r
-              PubkeyAcceptedKeyTypes +ssh-dss
           EO_SSH_CONFIG
         end
       end
@@ -69,14 +68,13 @@ describe HybridPlatformsConductor::ActionsExecutor do
             Host *
               User test_user
               ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_ssh_mux_%h_%p_%r
-              PubkeyAcceptedKeyTypes +ssh-dss
           EO_SSH_CONFIG
         end
       end
 
       it 'generates a global configuration with user taken from whoami when no env variable is set' do
         with_test_platform({}) do
-          original_user = ENV['USER']
+          original_user = ENV.fetch('USER', nil)
           begin
             ENV.delete 'USER'
             ENV.delete 'hpc_ssh_user'
@@ -106,7 +104,6 @@ describe HybridPlatformsConductor::ActionsExecutor do
             Host *
               User test_user
               ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_ssh_mux_%h_%p_%r
-              PubkeyAcceptedKeyTypes +ssh-dss
           EO_SSH_CONFIG
         end
       end
@@ -118,7 +115,6 @@ describe HybridPlatformsConductor::ActionsExecutor do
             Host *
               User test_user
               ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_ssh_mux_%h_%p_%r
-              PubkeyAcceptedKeyTypes +ssh-dss
               UserKnownHostsFile /path/to/known_hosts
           EO_SSH_CONFIG
         end
@@ -132,7 +128,6 @@ describe HybridPlatformsConductor::ActionsExecutor do
             Host *
               User test_user
               ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_ssh_mux_%h_%p_%r
-              PubkeyAcceptedKeyTypes +ssh-dss
               StrictHostKeyChecking no
           EO_SSH_CONFIG
         end

data/spec/hybrid_platforms_conductor_test/api/credentials_spec.rb

@@ -37,7 +37,7 @@ describe HybridPlatformsConductor::Credentials do
   it 'returns no credentials when they are not set' do
     with_platforms '' do
       # Check that .netrc won't be read
-      expect(::Netrc).not_to receive(:read)
+      expect(Netrc).not_to receive(:read)
       expect_credentials_to_be nil, nil
     end
   end
@@ -48,7 +48,7 @@ describe HybridPlatformsConductor::Credentials do
       ENV['hpc_password_for_test_credential'] = 'env_test_password'
       begin
         # Check that .netrc won't be read
-        expect(::Netrc).not_to receive(:read)
+        expect(Netrc).not_to receive(:read)
         expect_credentials_to_be 'env_test_user', 'env_test_password'
       ensure
         ENV.delete('hpc_user_for_test_credential')
@@ -78,8 +78,8 @@ describe HybridPlatformsConductor::Credentials do
 
   it 'returns credentials taken from .netrc when a resource is specified' do
     with_platforms '' do
-      expect(::Netrc).to receive(:read) do
-        mocked_netrc = instance_double(::Netrc)
+      expect(Netrc).to receive(:read) do
+        mocked_netrc = instance_double(Netrc)
         expect(mocked_netrc).to receive(:[]).with('my_domain.com').and_return %w[test_user test_password]
         expect(mocked_netrc).to receive(:instance_variable_get).with(:@data).and_return []
         mocked_netrc
@@ -90,8 +90,8 @@ describe HybridPlatformsConductor::Credentials do
 
   it 'returns credentials taken from .netrc when a non-URL resource is specified' do
     with_platforms '' do
-      expect(::Netrc).to receive(:read) do
-        mocked_netrc = instance_double(::Netrc)
+      expect(Netrc).to receive(:read) do
+        mocked_netrc = instance_double(Netrc)
         expect(mocked_netrc).to receive(:[]).with('This is:not/ a URL!').and_return %w[test_user test_password]
         expect(mocked_netrc).to receive(:instance_variable_get).with(:@data).and_return []
         mocked_netrc
@@ -103,8 +103,8 @@ describe HybridPlatformsConductor::Credentials do
   it 'erases the value of the password taken from netrc after usage' do
     with_platforms '' do
       netrc_data = [['mocked_data']]
-      expect(::Netrc).to receive(:read) do
-        mocked_netrc = instance_double(::Netrc)
+      expect(Netrc).to receive(:read) do
+        mocked_netrc = instance_double(Netrc)
         expect(mocked_netrc).to receive(:[]).with('my_domain.com').and_return %w[test_user test_password]
         expect(mocked_netrc).to receive(:instance_variable_get).with(:@data).and_return netrc_data
         mocked_netrc
@@ -133,7 +133,7 @@ describe HybridPlatformsConductor::Credentials do
       ENV['hpc_password_for_test_credential'] = 'env_test_password'
       begin
         # Check that .netrc won't be read
-        expect(::Netrc).not_to receive(:read)
+        expect(Netrc).not_to receive(:read)
         expect_credentials_to_be 'user_for_', 'password_for_'
       ensure
         ENV.delete('hpc_user_for_test_credential')
@@ -155,7 +155,7 @@ describe HybridPlatformsConductor::Credentials do
       ENV['hpc_password_for_test_credential'] = 'env_test_password'
       begin
         # Check that .netrc won't be read
-        expect(::Netrc).not_to receive(:read)
+        expect(Netrc).not_to receive(:read)
         expect_credentials_to_be 'user_for_test_resource', 'password_for_test_resource', resource: 'test_resource'
       ensure
         ENV.delete('hpc_user_for_test_credential')
@@ -166,7 +166,7 @@ describe HybridPlatformsConductor::Credentials do
 
   it 'returns credentials taken from config for a given resource even when they are nil' do
     with_platforms(
-      <<~'EO_CONFIG'
+      <<~EO_CONFIG
         credentials_for(:test_credential) do |resource, requester|
           requester.call nil, nil
         end
@@ -177,7 +177,7 @@ describe HybridPlatformsConductor::Credentials do
       ENV['hpc_password_for_test_credential'] = 'env_test_password'
       begin
         # Check that .netrc won't be read
-        expect(::Netrc).not_to receive(:read)
+        expect(Netrc).not_to receive(:read)
         expect_credentials_to_be nil, nil, resource: 'test_resource'
       ensure
         ENV.delete('hpc_user_for_test_credential')
@@ -233,7 +233,7 @@ describe HybridPlatformsConductor::Credentials do
 
   it 'fails if the requester is not called from config' do
     with_platforms(
-      <<~'EO_CONFIG'
+      <<~EO_CONFIG
         credentials_for(:test_credential) do |resource, requester|
         end
       EO_CONFIG

data/spec/hybrid_platforms_conductor_test/api/deployer/provisioners/docker/Dockerfile

@@ -1,5 +1,5 @@
 # This is an example of Dockerfile that can serve as an image for testing Docker handling in the Deployer
-FROM debian:stretch
+FROM debian:bookworm
 
 RUN apt-get update && apt-get install -y openssh-server
 RUN mkdir /var/run/sshd

data/spec/hybrid_platforms_conductor_test/api/deployer/provisioners/docker_spec.rb

@@ -43,12 +43,12 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Docker do
     # Make sure we use a unique environment for this test
     environment = "test_#{Process.pid}_#{(Time.now - Process.clock_gettime(Process::CLOCK_BOOTTIME)).strftime('%Y%m%d%H%M%S')}"
     with_test_docker_platform(environment) do |instance|
-      expect(::Docker::Container).to receive(:create).and_call_original
+      expect(Docker::Container).to receive(:create).and_call_original
       instance.create
       instance.wait_for_state! :created
       begin
         # Test that the instance is created
-        expect(::Docker::Container.all(all: true).find { |container| container.info['Names'].include? "/hpc_docker_container_node_#{environment}" }).not_to be_nil
+        expect(Docker::Container.all(all: true).find { |container| container.info['Names'].include? "/hpc_docker_container_node_#{environment}" }).not_to be_nil
         expect(instance.state).to eq :created
       ensure
         # Clean the Docker containers if needed
@@ -62,7 +62,7 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Docker do
       instance.create
       instance.wait_for_state! :created
       begin
-        expect(::Docker::Container).not_to receive(:create)
+        expect(Docker::Container).not_to receive(:create)
         instance.create
         expect(instance.state).to eq :created
       ensure

data/spec/hybrid_platforms_conductor_test/api/deployer/secrets_reader_plugins/keepass_spec.rb

@@ -76,7 +76,7 @@ describe HybridPlatformsConductor::Deployer do
           platform_info,
           additional_config: "read_secrets_from :keepass\n#{additional_config}"
         ) do
-          mock_databases.each do |database, _xml|
+          mock_databases.each_key do |database|
             expect(test_deployer.instance_variable_get(:@secrets_readers)[:keepass]).to receive(:with_credentials_for).with(:keepass, resource: database) do |_id, resource: nil, &client_code|
               client_code.call nil, mock_keepass_password
             end

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/cmdbs/config_spec.rb

@@ -14,7 +14,7 @@ describe HybridPlatformsConductor::NodesHandler do
     it 'sets different metadata for different nodes' do
       with_test_platform(
         { nodes: { 'node1' => {}, 'node2' => {} } },
-        additional_config: <<~'EO_CONFIG'
+        additional_config: <<~EO_CONFIG
           for_nodes('node1') { set_metadata(my_property_1: 'my_value1', my_property_2: 'my_value2') }
           for_nodes('node2') { set_metadata(my_property_2: 'my_value3', my_property_3: 'my_value4') }
         EO_CONFIG

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/cmdbs_plugins_api_spec.rb

@@ -276,7 +276,7 @@ describe HybridPlatformsConductor::NodesHandler do
     it 'can configure different priority rules for different properties on different nodes' do
       with_cmdb_test_platform(
         cmdbs: %i[test_cmdb test_cmdb_2],
-        additional_config: <<~'EO_CONFIG'
+        additional_config: <<~EO_CONFIG
           for_nodes('node1') do
             master_cmdbs(
               test_cmdb: :different_comment_2,
@@ -309,7 +309,7 @@ describe HybridPlatformsConductor::NodesHandler do
     it 'fails when there are conflicts in the definition of master CMDBs' do
       with_cmdb_test_platform(
         cmdbs: %i[test_cmdb test_cmdb_2],
-        additional_config: <<~'EO_CONFIG'
+        additional_config: <<~EO_CONFIG
           master_cmdbs(
             test_cmdb: %i[different_comment different_comment_2]
           )
@@ -326,7 +326,7 @@ describe HybridPlatformsConductor::NodesHandler do
     it 'fails when the CMDB marked as master does not implement the property' do
       with_cmdb_test_platform(
         cmdbs: %i[test_cmdb test_cmdb_2],
-        additional_config: <<~'EO_CONFIG'
+        additional_config: <<~EO_CONFIG
           master_cmdbs(
             test_cmdb_2: :upcase
           )

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/config_dsl_spec.rb

@@ -11,7 +11,7 @@ describe HybridPlatformsConductor::NodesHandler do
             'node3' => {}
           }
         },
-        additional_config: <<~'EO_CONFIG'
+        additional_config: <<~EO_CONFIG
           master_cmdbs(
             test_cmdb: :property_1,
             test_cmdb_2: :property_2

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/git_diff_impacts_spec.rb

@@ -70,7 +70,7 @@ describe HybridPlatformsConductor::NodesHandler do
                  gemspec
                 +
                 +gem 'byebug'
-                
+                 No newline at end of file
                 diff --git a/lib/hybrid_platforms_conductor/nodes_handler.rb b/lib/stale/hybrid_platforms_conductor/nodes_handler.rb
                 index e8e1778..69a84bd 100644
                 --- a/lib/hybrid_platforms_conductor/nodes_handler.rb
@@ -101,7 +101,7 @@ describe HybridPlatformsConductor::NodesHandler do
                  gemspec
                 +
                 +gem 'byebug'
-                
+                 No newline at end of file
               EO_STDOUT
             },
             'lib/hybrid_platforms_conductor/nodes_handler.rb' => {

data/spec/hybrid_platforms_conductor_test/api/platform_handlers/serverless_chef/packaging_spec.rb

@@ -332,7 +332,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
 
       it 'packages the repository with a testadmin public key in local mode' do
         with_serverless_chef_platforms('hpc_test') do |platform, repository|
-          File.write("#{ENV['hpc_platforms']}/testadmin.key.pub", 'ssh-rsa 12345 testadmin@test.com')
+          File.write("#{ENV.fetch('hpc_platforms', nil)}/testadmin.key.pub", 'ssh-rsa 12345 testadmin@test.com')
           with_packaging_mocked(
             repository,
             policy_file: 'policyfiles/test_policy.local.rb',
@@ -351,7 +351,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
 
       it 'does not package the repository with a testadmin public key in prod mode' do
         with_serverless_chef_platforms('hpc_test') do |platform, repository|
-          File.write("#{ENV['hpc_platforms']}/testadmin.key.pub", 'ssh-rsa 12345 testadmin@test.com')
+          File.write("#{ENV.fetch('hpc_platforms', nil)}/testadmin.key.pub", 'ssh-rsa 12345 testadmin@test.com')
           with_packaging_mocked(
             repository,
             cookbook_metadata: {

data/spec/hybrid_platforms_conductor_test/api/platforms_handler_spec.rb

@@ -70,7 +70,7 @@ describe HybridPlatformsConductor::PlatformsHandler do
           'platform1' => { platform_type: :test },
           'platform2' => { platform_type: :test_2 }
         },
-        additional_config: "test_2_platform path: \'#{repository}/platform1\'"
+        additional_config: "test_2_platform path: '#{repository}/platform1'"
       ) do
         expect { test_platforms_handler.known_platforms }.to raise_error 'Platform name platform1 is declared several times.'
       end
@@ -84,7 +84,7 @@ describe HybridPlatformsConductor::PlatformsHandler do
           'platform1' => { platform_type: :test },
           'platform2' => { platform_type: :test_2 }
         },
-        additional_config: "test_2_platform path: \'#{repository}\', name: 'other_platform'"
+        additional_config: "test_2_platform path: '#{repository}', name: 'other_platform'"
       ) do
         expect { test_platforms_handler.known_platforms }.to raise_error "Platform repository path #{repository} is declared several times."
       end
@@ -99,7 +99,7 @@ describe HybridPlatformsConductor::PlatformsHandler do
           'platform1' => { platform_type: :test },
           'platform2' => { platform_type: :test_2 }
         },
-        additional_config: "test_platform path: \'#{repository}/platform1\', name: 'other_platform'"
+        additional_config: "test_platform path: '#{repository}/platform1', name: 'other_platform'"
       ) do
         expect(test_platforms_handler.known_platforms.map(&:name).sort).to eq %w[platform1 platform2 other_platform].sort
       end

data/spec/hybrid_platforms_conductor_test/api/plugins_spec.rb

@@ -105,9 +105,7 @@ describe HybridPlatformsConductor::Plugins do
     with_test_platform({}) do
       plugins = described_class.new(
         :test_plugin_type,
-        init_plugin: proc do |plugin_class|
-          plugin_class.name
-        end,
+        init_plugin: proc(&:name),
         logger: logger,
         logger_stderr: logger
       )

data/spec/hybrid_platforms_conductor_test/api/services_handler/deploy_allowed_spec.rb

@@ -34,14 +34,14 @@ describe HybridPlatformsConductor::ServicesHandler do
     it 'allows deployment in local environment' do
       with_test_platform_for_services_test do
         with_cmd_runner_mocked([]) do
-          expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: true)).to be_nil
+          expect(test_services_handler.barrier_to_deploy(services: { 'node1' => %w[service1] }, local_environment: true)).to be_nil
         end
       end
     end
 
     it 'allows deployment if branch is on master' do
       with_test_platform_for_services_test do
-        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: false)).to be_nil
+        expect(test_services_handler.barrier_to_deploy(services: { 'node1' => %w[service1] }, local_environment: false)).to be_nil
       end
     end
 
@@ -52,7 +52,7 @@ describe HybridPlatformsConductor::ServicesHandler do
           deployable_services: %w[service1]
         }
       ) do
-        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: false)).to be_nil
+        expect(test_services_handler.barrier_to_deploy(services: { 'node1' => %w[service1] }, local_environment: false)).to be_nil
       end
     end
 
@@ -62,7 +62,7 @@ describe HybridPlatformsConductor::ServicesHandler do
           git = Git.open(repository)
           git.add_remote('another_remote', remote_repo).fetch
           git.checkout('remotes/another_remote/master')
-          expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: false)).to be_nil
+          expect(test_services_handler.barrier_to_deploy(services: { 'node1' => %w[service1] }, local_environment: false)).to be_nil
         end
       end
     end
@@ -70,14 +70,14 @@ describe HybridPlatformsConductor::ServicesHandler do
     it 'allows deployment if branch is on master even if not checked-out' do
       with_test_platform_for_services_test do |repository|
         Git.open(repository).branch('other_branch').checkout
-        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: false)).to be_nil
+        expect(test_services_handler.barrier_to_deploy(services: { 'node1' => %w[service1] }, local_environment: false)).to be_nil
       end
     end
 
     it 'refuses deployment if branch is not master' do
       with_test_platform_for_services_test do |repository|
         checkout_non_master_on(repository)
-        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: false)).to eq "The following platforms have not checked out master: #{repository}. Only master should be deployed in production."
+        expect(test_services_handler.barrier_to_deploy(services: { 'node1' => %w[service1] }, local_environment: false)).to eq "The following platforms have not checked out master: #{repository}. Only master should be deployed in production."
       end
     end
 
@@ -91,7 +91,7 @@ describe HybridPlatformsConductor::ServicesHandler do
         as_git: true
       ) do
         expect(
-          test_services_handler.deploy_allowed?(
+          test_services_handler.barrier_to_deploy(
             services: { 'node1' => %w[service1], 'node2' => %w[service2], 'node3' => %w[service3] },
             local_environment: false
           )
@@ -112,7 +112,7 @@ describe HybridPlatformsConductor::ServicesHandler do
         checkout_non_master_on(repositories['platform2'])
         checkout_non_master_on(repositories['platform4'])
         expect(
-          test_services_handler.deploy_allowed?(
+          test_services_handler.barrier_to_deploy(
             services: { 'node1' => %w[service1], 'node2' => %w[service2], 'node3' => %w[service3], 'node4' => %w[service4] },
             local_environment: false
           )
@@ -133,7 +133,7 @@ describe HybridPlatformsConductor::ServicesHandler do
         checkout_non_master_on(repositories['platform2'])
         checkout_non_master_on(repositories['platform4'])
         expect(
-          test_services_handler.deploy_allowed?(
+          test_services_handler.barrier_to_deploy(
             services: { 'node1' => %w[service1 service3] },
             local_environment: false
           )

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

@@ -53,7 +53,7 @@ describe HybridPlatformsConductor::TestsRunner do
   it 'returns 0 when tests are failing as expected' do
     with_test_platform(
       {},
-      additional_config: <<~'EO_CONFIG'
+      additional_config: <<~EO_CONFIG
         expect_tests_to_fail(:platform_test, 'Expected failure')
       EO_CONFIG
     ) do
@@ -67,7 +67,7 @@ describe HybridPlatformsConductor::TestsRunner do
   it 'returns 0 when tests are failing as expected on a given node' do
     with_test_platform(
       { nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {} } },
-      additional_config: <<~'EO_CONFIG'
+      additional_config: <<~EO_CONFIG
         for_nodes('node2') do
           expect_tests_to_fail(:node_test, 'Expected failure')
         end
@@ -83,7 +83,7 @@ describe HybridPlatformsConductor::TestsRunner do
   it 'returns 1 when tests are succeeding but were expected to fail' do
     with_test_platform(
       {},
-      additional_config: <<~'EO_CONFIG'
+      additional_config: <<~EO_CONFIG
         expect_tests_to_fail(:platform_test, 'Expected failure')
       EO_CONFIG
     ) do
@@ -96,7 +96,7 @@ describe HybridPlatformsConductor::TestsRunner do
   it 'returns 1 when extra expected failures have not been tested when running all tests' do
     with_test_platform(
       { nodes: { 'another_node' => {} } },
-      additional_config: <<~'EO_CONFIG'
+      additional_config: <<~EO_CONFIG
         for_nodes('another_node') do
           expect_tests_to_fail(:platform_test, 'Expected failure')
         end
@@ -111,7 +111,7 @@ describe HybridPlatformsConductor::TestsRunner do
   it 'fails when expected failures reference missing nodes' do
     with_test_platform(
       { nodes: { 'node' => {} } },
-      additional_config: <<~'EO_CONFIG'
+      additional_config: <<~EO_CONFIG
         for_nodes('missing_node') do
           expect_tests_to_fail(:node_test, 'Expected failure')
         end

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

@@ -134,7 +134,7 @@ describe HybridPlatformsConductor::TestsRunner do
 
     it 'reuses run_logs logs instead of running check-node when we ask for it' do
       with_test_platform_for_node_check_tests do
-        run_logs_dir = "#{ENV['hpc_platforms']}/run_logs"
+        run_logs_dir = "#{ENV.fetch('hpc_platforms', nil)}/run_logs"
         FileUtils.mkdir_p run_logs_dir
         File.write("#{run_logs_dir}/node11.stdout", 'node11 check ok from logs')
         File.write("#{run_logs_dir}/node12.stdout", 'node12 check ok from logs')
@@ -155,7 +155,7 @@ describe HybridPlatformsConductor::TestsRunner do
 
     it 'fails when some run_logs are missing' do
       with_test_platform_for_node_check_tests do
-        run_logs_dir = "#{ENV['hpc_platforms']}/run_logs"
+        run_logs_dir = "#{ENV.fetch('hpc_platforms', nil)}/run_logs"
         FileUtils.mkdir_p run_logs_dir
         File.write("#{run_logs_dir}/node11.stdout", 'node11 check ok from logs')
         File.write("#{run_logs_dir}/node12.stdout", 'node12 check ok from logs')

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

@@ -309,7 +309,7 @@ describe HybridPlatformsConductor::TestsRunner do
             'nodes_list2' => %w[node2 node3 node4]
           }
         },
-        additional_config: <<~'EO_CONFIG'
+        additional_config: <<~EO_CONFIG
           for_nodes('node1') do
             expect_tests_to_fail(:node_test, 'Expected failure')
           end

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

@@ -0,0 +1,69 @@
+describe HybridPlatformsConductor::TestsRunner do
+
+  context 'when checking test plugins' do
+
+    context 'with linear_strategy' do
+
+      it 'succeeds when git history is linear' do
+        with_test_platform({}) do |repository_path|
+          test_tests_runner.tests = [:linear_strategy]
+          with_cmd_runner_mocked [
+            ["cd #{repository_path} && git --no-pager log --merges --pretty=format:\"%H\"", proc { [0, '', ''] }]
+          ] do
+            expect(test_tests_runner.run_tests([])).to eq 0
+          end
+        end
+      end
+
+      it 'succeeds when git history is semi-linear' do
+        with_test_platform({}) do |repository_path|
+          test_tests_runner.tests = [:linear_strategy]
+          with_cmd_runner_mocked [
+            ["cd #{repository_path} && git --no-pager log --merges --pretty=format:\"%H\"", proc { [0, "11111111\n22222222\n", ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 11111111 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.11111111\s+\| grep '\|'$/, proc { [1, '', ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 22222222 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.22222222\s+\| grep '\|'$/, proc { [1, '', ''] }]
+          ] do
+            expect(test_tests_runner.run_tests([])).to eq 0
+          end
+        end
+      end
+
+      it 'fails when git history is not semi-linear' do
+        with_test_platform({}) do |repository_path|
+          test_tests_runner.tests = [:linear_strategy]
+          register_tests_report_plugins(test_tests_runner, report: HybridPlatformsConductorTest::TestsReportPlugin)
+          test_tests_runner.reports = [:report]
+          with_cmd_runner_mocked [
+            ["cd #{repository_path} && git --no-pager log --merges --pretty=format:\"%H\"", proc { [0, "11111111\n22222222\n", ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 11111111 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.11111111\s+\| grep '\|'$/, proc { [1, '', ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 22222222 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.22222222\s+\| grep '\|'$/, proc { [0, '* | 33333333', ''] }],
+            ["cd #{repository_path} && git show --no-patch --format=%ci 22222222", proc { [0, "#{(Time.now - (24 * 60 * 60)).strftime('%F %T')}\n", ''] }]
+          ] do
+            expect(test_tests_runner.run_tests([])).to eq 1
+            expect(HybridPlatformsConductorTest::TestsReportPlugin.reports.size).to eq 1
+            expect(HybridPlatformsConductorTest::TestsReportPlugin.reports.first[:platform_tests].sort).to eq [
+              [:linear_strategy, true, 'platform', ['Git history is not linear because of Merge commit 22222222']]
+            ]
+          end
+        end
+      end
+
+      it 'succeeds when git history is not semi-linear before 6 months' do
+        with_test_platform({}) do |repository_path|
+          test_tests_runner.tests = [:linear_strategy]
+          with_cmd_runner_mocked [
+            ["cd #{repository_path} && git --no-pager log --merges --pretty=format:\"%H\"", proc { [0, "11111111\n22222222\n", ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 11111111 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.11111111\s+\| grep '\|'$/, proc { [1, '', ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 22222222 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.22222222\s+\| grep '\|'$/, proc { [0, '* | 33333333', ''] }],
+            ["cd #{repository_path} && git show --no-patch --format=%ci 22222222", proc { [0, "#{(Time.now - (6 * 31 * 24 * 60 * 60)).strftime('%F %T')}\n", ''] }]
+          ] do
+            expect(test_tests_runner.run_tests([])).to eq 0
+          end
+        end
+      end
+
+    end
+
+  end
+
+end

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

@@ -35,7 +35,7 @@ describe 'executables\' common options' do
     # 'topograph' => ['--from', '--node node1', '--to', '--node node1', '--skip-run', '--output', 'graphviz:graph.gv'],
   }.each do |executable, default_options|
 
-    context "checking common options for #{executable}" do
+    context "when checking common options for #{executable}" do
 
       it 'displays its help' do
         with_test_platform_for_common_options do