@@ -12,6 +12,7 @@ require 'dm-aggregates' require 'yaml' require 'logger' require 'digest/sha1' +require 'timeout' require "core_ext/object" require "core_ext/string" lib/integrity.rb @@ -2,7 +2,9 @@ module Integrity class Notifier class Base def self.notify_of_build(build, config) - new(build, config).deliver! + Timeout.timeout(6) do + new(build, config).deliver! + end end def self.to_haml lib/integrity/notifier/base.rb @@ -32,6 +32,12 @@ describe Integrity::Notifier::Base do notifier.should_receive(:deliver!) klass.notify_of_build(mock_build, notifier_config) end + + it "should protect itself from timeout" do + lambda do + notifier.stub!(:deliver!).and_raise(Timeout::Error) + end.should_not raise_error + end end describe "generating the config form" do spec/notifier/base_spec.rb a10e36aafacd17430bd62ab67a938ac48383fbed Simon Rozet simon@rozet.name http://github.com/foca/integrity/commit/c969e8cae2aecd82a281016e02c2ef61b2a9b673 c969e8cae2aecd82a281016e02c2ef61b2a9b673 2008-11-20T11:36:18-08:00 2008-11-20T11:36:02-08:00 protection against eventual notifiers timeout error 99b96def3454bc453bcf960a17ee0735508f5ef6 Simon Rozet simon@rozet.name