diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-01-31 16:56:03 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-01-31 16:56:03 -0500 |
| commit | d6e0eeb1c68696316d2648366816688a95704351 (patch) | |
| tree | 863e7e71b4d2f7741174304e193b8579f93f7378 | |
| parent | acddd032d06fbfbb9f2bbdcc1a176b5bea35d5a3 (diff) | |
| parent | ddd84f6193ee44cdf33db60db469463940ea76cd (diff) | |
| download | rails-d6e0eeb1c68696316d2648366816688a95704351.tar.gz rails-d6e0eeb1c68696316d2648366816688a95704351.tar.bz2 rails-d6e0eeb1c68696316d2648366816688a95704351.zip | |
Merge pull request #23370 from maclover7/actioncable-main-travis-build
Move Action Cable back to the main build
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | actioncable/test/client_test.rb | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 869507a9fd..ae38617b99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,6 @@ rvm: matrix: allow_failures: - rvm: ruby-head - - env: "GEM=ac" fast_finish: true notifications: email: false diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb index 3c79d61569..199d2b90a3 100644 --- a/actioncable/test/client_test.rb +++ b/actioncable/test/client_test.rb @@ -146,15 +146,6 @@ class ClientTest < ActionCable::TestCase @ws.close @closed.wait(WAIT_WHEN_EXPECTING_EVENT) end - - def close! - sock = BasicSocket.for_fd(@ws.instance_variable_get(:@stream).detach) - - # Force a TCP reset - sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, [1, 0].pack('ii')) - - sock.close - end end def faye_client(port) |