test/test_driver.rb @@ -181,8 +181,6 @@ module God ::Process.kill('KILL', pid) rescue nil end end - - print "a - #{System::Process.new(::Process.pid).memory}\n"; sleep 1 if command.kind_of?(String) pid = nil @@ -199,20 +197,14 @@ module God puts pid.to_s # send pid back to forker end - print "b - #{System::Process.new(::Process.pid).memory}\n"; sleep 1 - ::Process.waitpid(opid, 0) w.close pid = r.gets.chomp - - print "c - #{System::Process.new(::Process.pid).memory}\n"; sleep 1 ensure # make sure the file descriptors get closed no matter what r.close rescue nil w.close rescue nil end - - print "d - #{System::Process.new(::Process.pid).memory}\n"; sleep 1 else # single fork self-daemonizing processes # we want to wait for them to finish @@ -227,8 +219,6 @@ module God ensure_stop if action == :stop end - print "e - #{System::Process.new(::Process.pid).memory}\n" - if @tracking_pid or (@pid_file.nil? and WRITES_PID.include?(action)) File.open(default_pid_file, 'w') do |f| f.write pid lib/god/process.rb @@ -11,6 +11,11 @@ class TestGod < Test::Unit::TestCase def teardown God.main && God.main.kill + if God.watches + God.watches.each do |k, w| + w.driver.thread.kill + end + end end # applog test/test_god.rb @@ -69,20 +69,4 @@ class TestMetric < Test::Unit::TestCase @metric.condition(:invalid) { } end end - - # enable - - def test_enable_should_attach_conditions - @metric.condition(:fake_poll_condition) - Hub.expects(:attach).with(@metric.conditions.first, @metric) - @metric.enable - end - - # disable - - def test_disable_should_detach_conditions - @metric.condition(:fake_poll_condition) - Hub.expects(:detach).with(@metric.conditions.first) - @metric.disable - end end \ No newline at end of file test/test_metric.rb @@ -2,19 +2,7 @@ require File.dirname(__FILE__) + '/helper' class TestTask < Test::Unit::TestCase def setup - God::Socket.stubs(:new).returns(true) God.internal_init - God.reset - - God.watch do |w| - w.name = 'foo' - w.start = 'bar' - w.interval = 10 - end - - @watch = God.watches['foo'] - - @task = Task.new @task.name = 'foo' @task.valid_states = [:foo, :bar] test/test_task.rb test/test_timer.rb f0c22dc03cabd961a8969905a9e485966a6cacdb tom tom@taco.desk.hq.powerset.com http://github.com/mojombo/god/commit/68a07c1f9b7ee371bd12a20ddfbe874a67d13918 68a07c1f9b7ee371bd12a20ddfbe874a67d13918 2008-01-28T15:39:36-08:00 2008-01-28T15:39:36-08:00 all tests passing and no extraneous output! 998e87d2630c09afd3c75caf79a297255682a98e tom tom@taco.desk.hq.powerset.com