Merge pull request sass#774 from xzyfer/trash/bad-signals

Fix `Errno::EINVAL` errors on timeout
mgreter · Apr 18, 2016 · cab24e9 · cab24e9
2 parents 02b7381 + eac4117
commit cab24e9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/sass_spec/capture_with_timeout.rb b/lib/sass_spec/capture_with_timeout.rb
@@ -41,7 +41,7 @@ def capture3_with_timeout(*cmd)
       :stdin_data => spawn_opts.delete(:stdin_data) || "",
       :binmode    => spawn_opts.delete(:binmode) || false,
       :timeout    => spawn_opts.delete(:timeout),
-      :signal     => spawn_opts.delete(:signal) || :TERM,
+      :signal     => spawn_opts.delete(:signal) || "TERM",
       :kill_after => spawn_opts.delete(:kill_after),
     }
 
@@ -94,7 +94,7 @@ def capture3_with_timeout(*cmd)
       Process.kill(opts[:signal], pid)
       if opts[:kill_after]
         unless wait_thr.join(opts[:kill_after])
-          Process.kill(:KILL, pid)
+          Process.kill("KILL", pid)
         end
       end
     ensure