1 files changed, 22 insertions, 3 deletions
diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb
index 70333e51bd..f316bc46ef 100644
--- a/actioncable/test/subscription_adapter/evented_redis_test.rb
+++ b/actioncable/test/subscription_adapter/evented_redis_test.rb
@@ -1,10 +1,29 @@
-require 'test_helper'
-require_relative './common'
+require "test_helper"
+require_relative "./common"
 
 class EventedRedisAdapterTest < ActionCable::TestCase
   include CommonSubscriptionAdapterTest
 
+  def setup
+    super
+
+    # em-hiredis is warning-rich
+    @previous_verbose, $VERBOSE = $VERBOSE, nil
+  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
+
   def cable_config
-    { adapter: 'evented_redis', url: 'redis://127.0.0.1:6379/12' }
+    { adapter: "evented_redis", url: "redis://127.0.0.1:6379/12" }
   end
 end