From a5abc310cdcf282444dc0a43788a62e857d3f2c9 Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Sun, 2 Oct 2016 11:01:30 +1030 Subject: Shut down EventMachine before re-enabling warnings --- actioncable/test/subscription_adapter/evented_redis_test.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'actioncable/test/subscription_adapter/evented_redis_test.rb') diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb index d6ca0e77cb..f316bc46ef 100644 --- a/actioncable/test/subscription_adapter/evented_redis_test.rb +++ b/actioncable/test/subscription_adapter/evented_redis_test.rb @@ -12,6 +12,14 @@ class EventedRedisAdapterTest < ActionCable::TestCase end def teardown + super + + # Ensure EM is shut down before we re-enable warnings + EventMachine.reactor_thread.tap do |thread| + EventMachine.stop + thread.join + end + $VERBOSE = @previous_verbose end -- cgit v1.2.3