Merge branch 'master' of git://github.com/rails/rails

1 files changed, 1 insertions, 17 deletions

diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb
index c41d81fe7e..d3af535c26 100644
--- a/activesupport/test/notifications_test.rb
+++ b/activesupport/test/notifications_test.rb
@@ -3,18 +3,12 @@ require 'abstract_unit'
 module Notifications
   class TestCase < ActiveSupport::TestCase
     def setup
-      Thread.abort_on_exception = true
-
       ActiveSupport::Notifications.notifier = nil
       @notifier = ActiveSupport::Notifications.notifier
       @events = []
       @notifier.subscribe { |*args| @events << event(*args) }
     end
 
-    def teardown
-      Thread.abort_on_exception = false
-    end
-
     private
       def event(*args)
         ActiveSupport::Notifications::Event.new(*args)
@@ -25,7 +19,7 @@ module Notifications
       end
   end
 
-  class PubSubTest < TestCase
+  class SyncPubSubTest < TestCase
     def test_events_are_published_to_a_listener
       @notifier.publish :foo
       @notifier.wait
@@ -72,16 +66,6 @@ module Notifications
       end
   end
 
-  class SyncPubSubTest < PubSubTest
-    def setup
-      Thread.abort_on_exception = true
-
-      @notifier = ActiveSupport::Notifications::Notifier.new(ActiveSupport::Notifications::Fanout.new(true))
-      @events = []
-      @notifier.subscribe { |*args| @events << event(*args) }
-    end
-  end
-
   class InstrumentationTest < TestCase
     delegate :instrument, :instrument!, :to => ActiveSupport::Notifications