aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/test
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-02-01 03:00:35 +1030
committerMatthew Draper <matthew@trebex.net>2016-02-01 03:01:32 +1030
commit4c38319cc25bb248947a089072442e843761e46d (patch)
treee8d21c8ab15423b0313417eeafd315126600b851 /actioncable/test
parent8dfb8760489abbf038d48e230e32c681b408ebfa (diff)
downloadrails-4c38319cc25bb248947a089072442e843761e46d.tar.gz
rails-4c38319cc25bb248947a089072442e843761e46d.tar.bz2
rails-4c38319cc25bb248947a089072442e843761e46d.zip
Wait for EventMachine to finish starting
Diffstat (limited to 'actioncable/test')
-rw-r--r--actioncable/test/client_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb
index d7eecfa322..3c79d61569 100644
--- a/actioncable/test/client_test.rb
+++ b/actioncable/test/client_test.rb
@@ -32,6 +32,7 @@ class ClientTest < ActionCable::TestCase
server.config.channel_load_paths = [File.expand_path('client', __dir__)]
Thread.new { EventMachine.run } unless EventMachine.reactor_running?
+ Thread.pass until EventMachine.reactor_running?
# faye-websocket is warning-rich
@previous_verbose, $VERBOSE = $VERBOSE, nil