diff --git a/definitions/checks/foreman_tasks/not_running.rb b/definitions/checks/foreman_tasks/not_running.rb index 1b2636b7d..6cc7f6433 100644 --- a/definitions/checks/foreman_tasks/not_running.rb +++ b/definitions/checks/foreman_tasks/not_running.rb @@ -10,10 +10,6 @@ class NotRunning < ForemanMaintain::Check 'Wait for tasks to finish or fail directly', :required => false, :default => true - param :investigate_tasks, - 'Allow task investigation', - :required => false, - :default => true end def run @@ -39,11 +35,11 @@ def calculate_next_steps steps = [] if @wait_for_tasks steps << Procedures::ForemanTasks::FetchTasksStatus.new(:state => 'running') - end - if @investigate_tasks - steps << Procedures::ForemanTasks::UiInvestigate.new( - 'search_query' => search_query_for_running_tasks - ) + unless assumeyes? + steps << Procedures::ForemanTasks::UiInvestigate.new( + 'search_query' => search_query_for_running_tasks + ) + end end steps end diff --git a/definitions/scenarios/backup.rb b/definitions/scenarios/backup.rb index 72a7b43d0..7340c1df0 100644 --- a/definitions/scenarios/backup.rb +++ b/definitions/scenarios/backup.rb @@ -38,8 +38,7 @@ class Backup < BackupBase def compose check_valid_strategy - add_step(Checks::ForemanTasks::NotRunning.new(:wait_for_tasks => wait_for_tasks, - :investigate_tasks => false)) + add_step(Checks::ForemanTasks::NotRunning.new(:wait_for_tasks => wait_for_tasks)) add_step(Checks::Pulpcore::NoRunningTasks.new(:wait_for_tasks => wait_for_tasks)) safety_confirmation add_step_with_context(Procedures::Backup::AccessibilityConfirmation) if strategy == :offline diff --git a/test/definitions/checks/foreman_tasks/not_running_test.rb b/test/definitions/checks/foreman_tasks/not_running_test.rb index 782f8fce0..3db35fa08 100644 --- a/test/definitions/checks/foreman_tasks/not_running_test.rb +++ b/test/definitions/checks/foreman_tasks/not_running_test.rb @@ -27,9 +27,9 @@ end end - context 'with wait_for_tasks=>false and investigate_tasks=>false' do + context 'with wait_for_tasks=>false' do subject do - Checks::ForemanTasks::NotRunning.new(:wait_for_tasks => false, :investigate_tasks => false) + Checks::ForemanTasks::NotRunning.new(:wait_for_tasks => false) end it 'passes when not active tasks are present' do