god 0.13.4 → 0.13.5

data/test/helper.rb

@@ -7,7 +7,8 @@ require File.join(File.dirname(__FILE__), *%w[.. lib god sys_logger])
 require File.join(File.dirname(__FILE__), *%w[.. lib god])
 God::EventHandler.load
 
-require 'test/unit'
+require 'minitest/autorun'
+require 'minitest/unit'
 require 'set'
 
 include God
@@ -115,12 +116,16 @@ end
 #   end
 # end
 
-module Test::Unit::Assertions
+module Minitest::Assertions
   def assert_abort
-    assert_raise SystemExit do
+    assert_raises SystemExit do
       yield
     end
   end
+
+  def assert_nothing_raised
+    yield
+  end
 end
 
 # This allows you to be a good OOP citizen and honor encapsulation, but

data/test/test_airbrake.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/helper'
 
-class TestAirbrake < Test::Unit::TestCase
+class TestAirbrake < Minitest::Test
   def test_notify
     airbrake = God::Contacts::Airbrake.new
     airbrake.apikey = "put_your_apikey_here"

data/test/test_behavior.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestBehavior < Test::Unit::TestCase
+class TestBehavior < Minitest::Test
   def test_generate_should_return_an_object_corresponding_to_the_given_type
     assert_equal Behaviors::FakeBehavior, Behavior.generate(:fake_behavior, nil).class
   end
 
   def test_generate_should_raise_on_invalid_type
-    assert_raise NoSuchBehaviorError do
+    assert_raises NoSuchBehaviorError do
       Behavior.generate(:foo, nil)
     end
   end

data/test/test_campfire.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestCampfire < Test::Unit::TestCase
+class TestCampfire < Minitest::Test
   def setup
     @campfire = God::Contacts::Campfire.new
   end

data/test/test_condition.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/helper'
 class BadlyImplementedCondition < PollCondition
 end
 
-class TestCondition < Test::Unit::TestCase
+class TestCondition < Minitest::Test
 
   # generate
 
@@ -12,7 +12,7 @@ class TestCondition < Test::Unit::TestCase
   end
 
   def test_generate_should_raise_on_invalid_type
-    assert_raise NoSuchConditionError do
+    assert_raises NoSuchConditionError do
       Condition.generate(:foo, nil)
     end
   end
@@ -45,7 +45,7 @@ class TestCondition < Test::Unit::TestCase
   def test_test_should_raise_if_not_defined_in_subclass
     c = BadlyImplementedCondition.new
 
-    assert_raise AbstractMethodNotOverriddenError do
+    assert_raises AbstractMethodNotOverriddenError do
       c.test
     end
   end

data/test/test_conditions_disk_usage.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestConditionsDiskUsage < Test::Unit::TestCase
+class TestConditionsDiskUsage < Minitest::Test
   # valid?
 
   def test_valid_should_return_false_if_no_above_given

data/test/test_conditions_http_response_code.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestHttpResponseCode < Test::Unit::TestCase
+class TestHttpResponseCode < Minitest::Test
   def valid_condition
     c = Conditions::HttpResponseCode.new()
     c.watch = stub(:name => 'foo')

data/test/test_conditions_process_running.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestConditionsProcessRunning < Test::Unit::TestCase
+class TestConditionsProcessRunning < Minitest::Test
   def test_missing_pid_file_returns_opposite
     [true, false].each do |r|
       c = Conditions::ProcessRunning.new

data/test/test_conditions_socket_responding.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestConditionsSocketResponding < Test::Unit::TestCase
+class TestConditionsSocketResponding < Minitest::Test
   # valid?
 
   def test_valid_should_return_false_if_no_options_set

data/test/test_conditions_tries.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestConditionsTries < Test::Unit::TestCase
+class TestConditionsTries < Minitest::Test
   # valid?
 
   def test_valid_should_return_false_if_times_not_set
@@ -11,7 +11,7 @@ class TestConditionsTries < Test::Unit::TestCase
 end
 
 
-class TestConditionsTries < Test::Unit::TestCase
+class TestConditionsTries < Minitest::Test
   def setup
     @c = Conditions::Tries.new
     @c.times = 3
@@ -42,7 +42,7 @@ class TestConditionsTries < Test::Unit::TestCase
 end
 
 
-class TestConditionsTriesWithin < Test::Unit::TestCase
+class TestConditionsTriesWithin < Minitest::Test
   def setup
     @c = Conditions::Tries.new
     @c.times = 3

data/test/test_contact.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestContact < Test::Unit::TestCase
+class TestContact < Minitest::Test
   def test_exists
     God::Contact
   end
@@ -8,7 +8,7 @@ class TestContact < Test::Unit::TestCase
   # generate
 
   def test_generate_should_raise_on_invalid_kind
-    assert_raise(NoSuchContactError) do
+    assert_raises(NoSuchContactError) do
       Contact.generate(:invalid)
     end
   end
@@ -59,42 +59,42 @@ class TestContact < Test::Unit::TestCase
 
   def test_normalize_should_raise_on_non_string_array_hash
     input = 1
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       Contact.normalize(input)
     end
   end
 
   def test_normalize_should_raise_on_non_string_array_contacts_key
     input = {:contacts => 1}
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       Contact.normalize(input)
     end
   end
 
   def test_normalize_should_raise_on_non_string_containing_array
     input = [1]
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       Contact.normalize(input)
     end
   end
 
   def test_normalize_should_raise_on_non_string_containing_array_contacts_key
     input = {:contacts => [1]}
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       Contact.normalize(input)
     end
   end
 
   def test_normalize_should_raise_on_absent_contacts_key
     input = {}
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       Contact.normalize(input)
     end
   end
 
   def test_normalize_should_raise_on_extra_keys
     input = {:contacts => ['tom'], :priority => 1, :category => 'product', :extra => 'foo'}
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       Contact.normalize(input)
     end
   end
@@ -102,7 +102,7 @@ class TestContact < Test::Unit::TestCase
   # notify
 
   def test_notify_should_be_abstract
-    assert_raise(AbstractMethodNotOverriddenError) do
+    assert_raises(AbstractMethodNotOverriddenError) do
       Contact.new.notify(:a, :b, :c, :d, :e)
     end
   end

data/test/test_driver.rb

@@ -1,14 +1,15 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestDriver < Test::Unit::TestCase
+class TestDriver < Minitest::Test
   def setup
 
   end
 
   def test_push_pop_wait
-    eq = God::DriverEventQueue.new
 
-    MonitorMixin::ConditionVariable.any_instance.expects(:wait).times(1)
+    eq = God::DriverEventQueue.new
+    cond = eq.instance_variable_get(:@resource)
+    cond.expects(:wait).times(1)
 
     eq.push(God::TimedEvent.new(0))
     eq.push(God::TimedEvent.new(0.1))

data/test/test_email.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestEmail < Test::Unit::TestCase
+class TestEmail < Minitest::Test
   def setup
     God::Contacts::Email.to_email = 'dev@example.com'
     God::Contacts::Email.from_email = 'god@example.com'

data/test/test_event_handler.rb

@@ -17,7 +17,7 @@ module God
   end
 end
 
-class TestEventHandler < Test::Unit::TestCase
+class TestEventHandler < Minitest::Test
   def setup
     @h = God::EventHandler
   end
@@ -74,7 +74,7 @@ end
 
 # This doesn't currently work:
 #
-# class TestEventHandlerOperational < Test::Unit::TestCase
+# class TestEventHandlerOperational < Minitest::Test
 #   def test_operational
 #     God::EventHandler.start
 #     assert God::EventHandler.loaded?

data/test/test_god.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
-
-class TestGod < Test::Unit::TestCase
+class TestGod < MiniTest::Test
   def setup
     God::Socket.stubs(:new).returns(true)
     God.stubs(:setup).returns(true)
@@ -16,6 +15,10 @@ class TestGod < Test::Unit::TestCase
         w.driver.thread.kill
       end
     end
+    God.reset
+    #Some of the tests in this file intentionally set pid_file_directory to an invalid value
+    #This can cause a later test failure since God will call abort if pid_file_directory is not writable    
+    God.pid_file_directory = '~/.god/pids'
   end
 
   # applog
@@ -32,11 +35,10 @@ class TestGod < Test::Unit::TestCase
     assert_equal Hash.new, God.watches
   end
 
-  # init
+  # # init
 
   def test_pid_file_directory_should_abort_if_called_after_watch
     God.watch { |w| w.name = 'foo'; w.start = 'bar' }
-
     assert_abort do
       God.pid_file_directory = 'foo'
     end
@@ -313,7 +315,7 @@ class TestGod < Test::Unit::TestCase
   def test_control_should_raise_on_invalid_command
     God.watch { |w| w.name = 'foo'; w.start = 'bar' }
 
-    assert_raise InvalidCommandError do
+    assert_raises InvalidCommandError do
       God.control('foo', 'invalid')
     end
   end
@@ -451,7 +453,7 @@ class TestGod < Test::Unit::TestCase
 
   def test_running_log_should_raise_on_unknown_watch
     God.internal_init
-    assert_raise(NoSuchWatchError) do
+    assert_raises(NoSuchWatchError) do
       God.running_log('foo', Time.now)
     end
   end
@@ -662,7 +664,7 @@ class TestGod < Test::Unit::TestCase
 end
 
 
-# class TestGodOther < Test::Unit::TestCase
+# class TestGodOther < Minitest::Test
 #   def setup
 #     God::Socket.stubs(:new).returns(true)
 #     God.internal_init

data/test/test_handlers_kqueue_handler.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/helper'
 
 if God::EventHandler.event_system == "kqueue"
 
-  class TestHandlersKqueueHandler < Test::Unit::TestCase
+  class TestHandlersKqueueHandler < Minitest::Test
     def test_register_process
       KQueueHandler.expects(:monitor_process).with(1234, 2147483648)
       KQueueHandler.register_process(1234, [:proc_exit])

data/test/test_hipchat.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestHipchat < Test::Unit::TestCase
+class TestHipchat < Minitest::Test
   def setup
     @hipchat = God::Contacts::Hipchat.new
   end

data/test/test_jabber.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/helper'
 
-class TestJabber < Test::Unit::TestCase
+class TestJabber < Minitest::Test
 
   def setup
     @jabber = God::Contacts::Jabber.new

data/test/test_logger.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestLogger < Test::Unit::TestCase
+class TestLogger < Minitest::Test
   def setup
     @log = God::Logger.new(StringIO.new('/dev/null'))
   end
@@ -41,8 +41,8 @@ class TestLogger < Test::Unit::TestCase
 
     out = @log.watch_log_since('foo', t2)
 
-    assert_no_match(/one/, out)
-    assert_no_match(/two/, out)
+    assert(/one/ !~ out)
+    assert(/two/ !~ out)
     assert_match(/three/, out)
   end
 

data/test/test_metric.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestMetric < Test::Unit::TestCase
+class TestMetric < Minitest::Test
   def setup
     @metric = Metric.new(stub(:interval => 10), nil)
   end

data/test/test_process.rb

@@ -12,7 +12,7 @@ module God
   end
 end
 
-class TestProcessChild < Test::Unit::TestCase
+class TestProcessChild < Minitest::Test
   def setup
     God.internal_init
     @p = God::Process.new
@@ -45,6 +45,9 @@ class TestProcessChild < Test::Unit::TestCase
     @p.log = '/tmp/foo.log'
     @p.uid = 'root'
 
+    ::Process.stubs(:groups=)
+    ::Process.stubs(:initgroups)
+
     assert @p.valid?
   end
 
@@ -142,13 +145,14 @@ end
 #
 ###############################################################################
 
-class TestProcessDaemon < Test::Unit::TestCase
+class TestProcessDaemon < Minitest::Test
   def setup
     God.internal_init
     @p = God::Process.new
     @p.name = 'foo'
     @p.pid_file = 'blah.pid'
     @p.stubs(:test).returns true # so we don't try to mkdir_p
+    God::System::Process.stubs(:fetch_system_poller).returns(God::System::PortablePoller)
     Process.stubs(:detach) # because we stub fork
   end
 
@@ -243,7 +247,7 @@ class TestProcessDaemon < Test::Unit::TestCase
 
     assert @p.valid?
 
-    assert_raise NotImplementedError do
+    assert_raises NotImplementedError do
       @p.call_action(:start)
     end
   end

data/test/test_prowl.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/helper'
 
-class TestProwl < Test::Unit::TestCase
+class TestProwl < Minitest::Test
   def test_live_notify
     prowl = God::Contacts::Prowl.new
     prowl.name = "Prowly"

data/test/test_registry.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestRegistry < Test::Unit::TestCase
+class TestRegistry < Minitest::Test
   def setup
     God.registry.reset
   end