3 files changed, 31 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index a97cba31ee..4bcf7ef7df 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Deprecation: silence warnings when reporting test errors.  [Jeremy Kemper]
+
 * Hash#slice(*keys) returns a new hash with only the given keys. #slice! replaces the hash with only the given keys. Works with HashWithIndifferentAccess also.  [Jeremy Kemper]
 
 * HashWithIndifferentAccess#to_hash converts to a Hash with String keys and the same default value.  [Jeremy Kemper]
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb
index b9c732691a..247aa4e1ad 100644
--- a/activesupport/lib/active_support/deprecation.rb
+++ b/activesupport/lib/active_support/deprecation.rb
@@ -172,10 +172,23 @@ class Module
   include ActiveSupport::Deprecation::ClassMethods
 end
 
+require 'test/unit'
+
 module Test
   module Unit
     class TestCase
       include ActiveSupport::Deprecation::Assertions
     end
+
+    class Error # :nodoc:
+      # Silence warnings when reporting test errors.
+      def message_with_silenced_deprecation
+        ActiveSupport::Deprecation.silence do
+          message_without_silenced_deprecation
+        end
+      end
+
+      alias_method_chain :message, :silenced_deprecation
+    end
   end
 end
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index 21baa11a80..5699ef78d6 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -128,4 +128,20 @@ class DeprecationTest < Test::Unit::TestCase
   def test_deprecation_with_explicit_message
     assert_deprecated(/you now need to do something extra for this one/) { @dtc.d }
   end
+
+  def test_assertion_failed_error_doesnt_spout_deprecation_warnings
+    error_class = Class.new(StandardError) do
+      def message
+        ActiveSupport::Deprecation.warn 'warning in error message'
+        super
+      end
+    end
+
+    raise error_class.new('hmm')
+
+  rescue => e
+    error = Test::Unit::Error.new('testing ur doodz', e)
+    assert_not_deprecated { error.message }
+    assert_nil @last_message
+  end
 end