Merge pull request #23370 from maclover7/actioncable-main-travis-build

Move Action Cable back to the main build
rails · Jan 31, 2016 · d6e0eeb · d6e0eeb
2 parents acddd03 + ddd84f6
commit d6e0eeb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git 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
@@ -146,15 +146,6 @@ def close
       @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)