Fix failing unit tests

Author: hgreebe

cookbooks/aws-parallelcluster-environment/resources/cfn_hup_configuration.rb

@@ -95,7 +95,6 @@
       variables(
         monitor_shared_dir: monitor_shared_dir,
         launch_template_resource_id: node['cluster']['launch_template_id'],
-        update_dir: node['cluster']['shared_update_path']
       )
     end
   end

cookbooks/aws-parallelcluster-environment/spec/unit/resources/cfn_hup_configuration_spec.rb

@@ -84,7 +84,6 @@ def self.configure(chef_run)
                 launch_template_resource_id: LAUNCH_TEMPLATE_ID,
                 update_hook_script_dir: SCRIPT_DIR,
                 node_bootstrap_timeout: NODE_BOOTSTRAP_TIMEOUT,
-                update_dir: "#{MONITOR_SHARED_DIR}/check_update",
              })
           end
 

cookbooks/aws-parallelcluster-platform/spec/unit/recipes/supervisord_config_spec.rb

@@ -57,28 +57,6 @@
         end
       end
 
-      context "when head node and cfn-hup disabled on fleet" do
-        cached(:chef_run) do
-          runner = runner(platform: platform, version: version) do |node|
-            node.override['cluster']['node_type'] = 'HeadNode'
-            node.override['cluster']['dcv_enabled'] = 'head_node'
-            node.override['cluster']['in_place_update_on_fleet_enabled'] = 'false'
-            allow_any_instance_of(Object).to receive(:dcv_installed?).and_return(true)
-          end
-          runner.converge(described_recipe)
-        end
-        cached(:node) { chef_run.node }
-
-        it 'has the correct content' do
-          is_expected.to render_file('/etc/parallelcluster/parallelcluster_supervisord.conf')
-            .with_content("[program:cfn-hup]")
-            .with_content("[program:clustermgtd]")
-            .with_content("[program:clusterstatusmgtd]")
-            .with_content("[program:pcluster_dcv_authenticator]")
-            .with_content("--port 8444")
-        end
-      end
-
       context "when compute fleet" do
         cached(:chef_run) do
           runner = runner(platform: platform, version: version) do |node|
@@ -92,32 +70,16 @@
 
         it 'has the correct content' do
           is_expected.to render_file('/etc/parallelcluster/parallelcluster_supervisord.conf')
-            .with_content("[program:cfn-hup]")
             .with_content("[program:computemgtd]")
 
           is_expected.not_to render_file('/etc/parallelcluster/parallelcluster_supervisord.conf')
             .with_content("[program:pcluster_dcv_authenticator]")
-        end
-      end
-
-      context "when compute fleet with cfn-hup disabled on fleet" do
-        cached(:chef_run) do
-          runner = runner(platform: platform, version: version) do |node|
-            node.override['cluster']['node_type'] = 'ComputeFleet'
-            node.override['cluster']['in_place_update_on_fleet_enabled'] = 'false'
-          end
-          runner.converge(described_recipe)
-        end
-        cached(:node) { chef_run.node }
-
-        it 'has the correct content' do
-          is_expected.to render_file('/etc/parallelcluster/parallelcluster_supervisord.conf')
-            .with_content("[program:computemgtd]")
 
           is_expected.not_to render_file('/etc/parallelcluster/parallelcluster_supervisord.conf')
             .with_content("[program:cfn-hup]")
         end
       end
+
       context "when login node and dcv configured" do
         cached(:chef_run) do
           runner = runner(platform: platform, version: version) do |node|
@@ -157,25 +119,6 @@
               .with_content("[program:pcluster_dcv_authenticator]")
           end
         end
-
-        context "when login node with cfn-hup disabled on fleet" do
-          cached(:chef_run) do
-            runner = runner(platform: platform, version: version) do |node|
-              node.override['cluster']['node_type'] = 'LoginNode'
-              node.override['cluster']['in_place_update_on_fleet_enabled'] = 'false'
-            end
-            runner.converge(described_recipe)
-          end
-          cached(:node) { chef_run.node }
-
-          it 'has the correct content' do
-            is_expected.to render_file('/etc/parallelcluster/parallelcluster_supervisord.conf')
-              .with_content("[program:loginmgtd]")
-
-            is_expected.not_to render_file('/etc/parallelcluster/parallelcluster_supervisord.conf')
-              .with_content("[program:cfn-hup]")
-          end
-        end
       end
     end
   end

cookbooks/aws-parallelcluster-slurm/spec/unit/recipes/update_head_node_spec.rb

@@ -73,26 +73,6 @@
           end
         end
       end
-
-      context 'when cluster readiness check is disabled' do
-        cached(:chef_run) do
-          runner = runner(platform: platform, version: version) do |node|
-            allow_any_instance_of(Object).to receive(:are_mount_or_unmount_required?).and_return(false)
-            allow_any_instance_of(Object).to receive(:dig).and_return(true)
-            allow_any_instance_of(Object).to receive(:cookbook_virtualenv_path).and_return(cookbook_venv_path)
-            RSpec::Mocks.configuration.allow_message_expectations_on_nil = true
-
-            node.override['cluster']['stack_name'] = cluster_name
-            node.override['cluster']['region'] = region
-            node.override['cluster']['cluster_config_version'] = cluster_config_version
-            node.override['cluster']['scripts_dir'] = scripts_dir
-          end
-          runner.converge(described_recipe)
-        end
-        it 'does not check cluster readiness' do
-          is_expected.not_to run_execute("Check cluster readiness")
-        end
-      end
     end
   end
 end