Fix a bug when logging notifier timeout

Signed-off-by: Simon Rozet <simon@rozet.name>
integrity · Jun 1, 2009 · a80993f · a80993f
1 parent 0f05e9b
commit a80993f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/integrity/notifier/base.rb b/lib/integrity/notifier/base.rb
@@ -5,7 +5,7 @@ def self.notify_of_build(build, config)
         Integrity.log "Notifying of build #{build.commit.short_identifier} using the #{to_s} notifier"
         Timeout.timeout(8) { new(build.commit, config).deliver! }
       rescue Timeout::Error
-        Integrity.log "#{notifier.name} notifier timed out"
+        Integrity.log "#{to_s} notifier timed out"
         false
       end
 

diff --git a/test/unit/notifier_test.rb b/test/unit/notifier_test.rb
@@ -93,4 +93,16 @@ class NotifierTest < Test::Unit::TestCase
 
     irc.notify_of_build(build)
   end
+
+  it "handles notifier timeouts" do
+    irc   = Notifier.gen(:irc)
+    Notifier.register(Integrity::Notifier::IRC)
+    build = Build.gen
+
+    stub.instance_of(Notifier::IRC).deliver! { raise Timeout::Error }
+    mock(Integrity).log(anything)
+    mock(Integrity).log("Integrity::Notifier::IRC notifier timed out") { nil }
+
+    irc.notify_of_build(build)
+  end
 end