Merge pull request #449 from sunny4381/fix-job-service-issue

remove "e.kind_of?(fatal)" from Job::Service#system_error? because the NameError occurs
shirasagi · May 22, 2015 · 05be312 · 05be312
2 parents 0487d30 + 2a14a23
commit 05be312
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/models/job/service.rb b/app/models/job/service.rb
@@ -110,7 +110,8 @@ def execute_loop
     end
 
     def system_error?(e)
-      e.kind_of?(NoMemoryError) || e.kind_of?(SignalException) || e.kind_of?(SystemExit) || e.kind_of?(fatal)
+      # e.kind_of?(NoMemoryError) || e.kind_of?(SignalException) || e.kind_of?(SystemExit) || e.kind_of?(fatal)
+      e.kind_of?(NoMemoryError) || e.kind_of?(SignalException) || e.kind_of?(SystemExit)
     end
 
     def create_job(task)

diff --git a/spec/models/voice/synthesis_job_spec.rb b/spec/models/voice/synthesis_job_spec.rb
@@ -89,7 +89,7 @@
       end
 
       it { expect(@job).not_to be_nil }
-      it { expect(system(@cmd)).to be false }
+      it { expect(system(@cmd)).to be_truthy }
 
       describe "job" do
         subject { Job::Task.find_by(name: 'job:voice_synthesis') rescue nil }
@@ -119,7 +119,7 @@
       end
 
       it { expect(@job).not_to be_nil }
-      it { expect(system(@cmd)).to be_falsey }
+      it { expect(system(@cmd)).to be_truthy }
 
       describe "job" do
         subject { Job::Task.find_by(name: 'job:voice_synthesis') rescue nil }
@@ -149,7 +149,7 @@
       end
 
       it { expect(@job).not_to be_nil }
-      it { expect(system(@cmd)).to be_falsey }
+      it { expect(system(@cmd)).to be_truthy }
 
       describe "job" do
         subject { Job::Task.find_by(name: 'job:voice_synthesis') rescue nil }
@@ -181,7 +181,7 @@
       end
 
       it { expect(@job).not_to be_nil }
-      it { expect(system(@cmd)).to be_falsey }
+      it { expect(system(@cmd)).to be_truthy }
 
       describe "job" do
         subject { Job::Task.find_by(name: 'job:voice_synthesis') rescue nil }