diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-10-02 11:01:30 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-10-02 12:25:33 +1030 |
| commit | a5abc310cdcf282444dc0a43788a62e857d3f2c9 (patch) | |
| tree | 7cdc31c50795e18f25eb51bb5d0f90ec545fa845 /actioncable/test/subscription_adapter/evented_redis_test.rb | |
| parent | 53ede1aff2025d4391d0e05ba471fdaf3110a99c (diff) | |
| download | rails-a5abc310cdcf282444dc0a43788a62e857d3f2c9.tar.gz rails-a5abc310cdcf282444dc0a43788a62e857d3f2c9.tar.bz2 rails-a5abc310cdcf282444dc0a43788a62e857d3f2c9.zip | |
Shut down EventMachine before re-enabling warnings
Diffstat (limited to 'actioncable/test/subscription_adapter/evented_redis_test.rb')
| -rw-r--r-- | actioncable/test/subscription_adapter/evented_redis_test.rb | 8 |
1 files changed, 8 insertions, 0 deletions
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 |