Permalink
Browse files

Add a timeout so that spec failure on JRuby doesn't take down Travis

  • Loading branch information...
1 parent ae7f2a2 commit c44ab07a8907ca6e24e668ae23185e1a1514d4fb @benlangfeld benlangfeld committed Nov 15, 2012
Showing with 5 additions and 1 deletion.
  1. +1 −0 .travis.yml
  2. +4 −1 spec/ruby_fs/stream_spec.rb
View
@@ -3,6 +3,7 @@ rvm:
- 1.9.2
- 1.9.3
- rbx-19mode
+ - jruby-19mode
- ruby-head
notifications:
irc: "irc.freenode.org#adhearsion"
@@ -1,4 +1,5 @@
require 'spec_helper'
+require 'timeout'
module RubyFS
describe Stream do
@@ -37,7 +38,9 @@ def mocked_server(times = nil, fake_client = nil, &block)
sleep 0.1
fake_client.call s if fake_client.respond_to? :call
Celluloid::Actor.join s
- Celluloid::Actor.join @stream
+ Timeout.timeout 5 do
+ Celluloid::Actor.join @stream
+ end
end
def expect_connected_event

0 comments on commit c44ab07

Please sign in to comment.