aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/test
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-01-28 22:02:48 +1030
committerMatthew Draper <matthew@trebex.net>2016-01-30 03:46:37 +1030
commit3043601d7ab4a3b0e7eea1c6353ab96258f8a78c (patch)
tree4d612ea486f4ffd69ca23e36fdb667cc102c9d12 /actioncable/test
parent0b94afb0757e02deccced2d85b8478b78f269e0b (diff)
downloadrails-3043601d7ab4a3b0e7eea1c6353ab96258f8a78c.tar.gz
rails-3043601d7ab4a3b0e7eea1c6353ab96258f8a78c.tar.bz2
rails-3043601d7ab4a3b0e7eea1c6353ab96258f8a78c.zip
Reduce the client count, in hope of a more consistent test
Diffstat (limited to 'actioncable/test')
-rw-r--r--actioncable/test/client_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb
index 66fa79afd6..4629d858a1 100644
--- a/actioncable/test/client_test.rb
+++ b/actioncable/test/client_test.rb
@@ -40,12 +40,12 @@ class ClientTest < ActionCable::TestCase
end
def teardown
- $VERBOSE = @previous_verbose
-
if @reactor_running.set?
EM.stop
end
+ $VERBOSE = @previous_verbose
+
begin
::Object.send(:remove_const, :ApplicationCable)
rescue NameError
@@ -209,7 +209,7 @@ class ClientTest < ActionCable::TestCase
def test_interacting_clients
with_puma_server do |port|
- clients = 20.times.map { faye_client(port) }
+ clients = 10.times.map { faye_client(port) }
barrier_1 = Concurrent::CyclicBarrier.new(clients.size)
barrier_2 = Concurrent::CyclicBarrier.new(clients.size)