Merge pull request ManageIQ#16627 from yrudman/fix-error-in-timeout-c…

…hecking-for-job-without-target Fix error in timeout checking for job without target
saulotoledo · Dec 11, 2017 · 5729359 · 5729359
2 parents 5549221 + 7d0c95d
commit 5729359
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/models/job.rb b/app/models/job.rb
@@ -148,7 +148,7 @@ def timeout!
   end
 
   def target_entity
-    target_class.constantize.find_by(:id => target_id)
+    target_class.constantize.find_by(:id => target_id) if target_class
   end
 
   def self.check_jobs_for_timeout

diff --git a/spec/models/job_spec.rb b/spec/models/job_spec.rb
@@ -271,6 +271,11 @@
           expect(@job.timeout_adjustment).to eq(1)
           expect(@image_scan_job.timeout_adjustment).to eq(1)
         end
+
+        it "returns the correct adjusment 1 if target class was not defined" do
+          job_without_target = Job.create_job("VmScan", :target_class => nil)
+          expect(job_without_target.timeout_adjustment).to eq(1)
+        end
       end
     end