Yoji Shidara
null+****@clear*****
Thu Nov 28 19:01:57 JST 2013
Yoji Shidara 2013-11-28 19:01:57 +0900 (Thu, 28 Nov 2013) New Revision: ff129f580945bd450310fd92a5843f58f255b7d3 https://github.com/droonga/drntest/commit/ff129f580945bd450310fd92a5843f58f255b7d3 Message: Revert "Add workaround for long test time" Does not work well in some environments... This reverts commit 9e3f773e19f16088d4703e5333e82e36d6d5f91e. Modified files: lib/drntest/test-runner.rb Modified: lib/drntest/test-runner.rb (+1 -21) =================================================================== --- lib/drntest/test-runner.rb 2013-11-28 19:01:50 +0900 (b227983) +++ lib/drntest/test-runner.rb 2013-11-28 19:01:57 +0900 (5494283) @@ -121,27 +121,7 @@ module Drntest return unless temporary_engine? Process.kill(:TERM, @engine_pid) - - # TODO: It's a workaround. - # Implement engine's queue without Groonga's job queue. - terminated = false - timeout = 3 - sleep_time = 1 - while timeout > 0 - sleep(sleep_time) - timeout -= timeout - if Process.waitpid(@engine_pid, Process::WNOHANG) - terminated = true - break - end - end - unless terminated - begin - Process.kill(:KILL, - �� engine_pid) - Process.wait(@engine_pid) - rescue SystemCallError - end - end + Process.wait(@engine_pid) FileUtils.rm_rf(temporary_dir.to_s) end -------------- next part -------------- HTML����������������������������...Download
