Allow for empty strings in the execution_ttl field

https://bugzilla.redhat.com/show_bug.cgi?id=1601538 An empty string yields a 0 timeout value causing jobs to be terminated right away.
mkanoor · Jul 16, 2018 · 40abd08 · 40abd08
1 parent f07d954
commit 40abd08
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/playbook_runner.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/playbook_runner.rb
@@ -13,7 +13,7 @@ def minimize_indirect
 
   def current_job_timeout(_timeout_adjustment = 1)
     @execution_ttl ||=
-      (options[:execution_ttl].try(:to_i) || DEFAULT_EXECUTION_TTL) * 60
+      (options[:execution_ttl].present? ? options[:execution_ttl].try(:to_i) : DEFAULT_EXECUTION_TTL) * 60
   end
 
   def start

diff --git a/spec/models/manageiq/providers/embedded_ansible/automation_manager/playbook_runner_spec.rb b/spec/models/manageiq/providers/embedded_ansible/automation_manager/playbook_runner_spec.rb
@@ -48,6 +48,14 @@
         expect(subject.current_job_timeout).to eq(described_class::DEFAULT_EXECUTION_TTL * 60)
       end
     end
+
+    context 'timeout is blank in options' do
+      let(:options) { {:execution_ttl => ""} }
+
+      it 'uses default timeout value' do
+        expect(subject.current_job_timeout).to eq(described_class::DEFAULT_EXECUTION_TTL * 60)
+      end
+    end
   end
 
   describe '#create_inventory' do