Skip to content

Commit

Permalink
Merge pull request #673 from olleolleolle/patch-3
Browse files Browse the repository at this point in the history
Travis: jruby-9.1.15.0 - and disable Actor-related tests on JRuby
  • Loading branch information
pitr-ch committed Feb 21, 2018
2 parents 967f98a + 5c41cee commit d3ce358
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: ruby
rvm:
# start with the latest
- 2.4.1
- jruby-9.1.12.0
- jruby-9.1.15.0

# older versions
- 2.3.4
Expand All @@ -18,7 +18,7 @@ rvm:
- ruby-head
- jruby-head

- rbx
- rbx-3

jdk:
- oraclejdk8
Expand All @@ -30,6 +30,7 @@ branches:
- master

matrix:
fast_finish: true
include:
- rvm: 2.3.4
jdk: oraclejdk8
Expand All @@ -38,7 +39,7 @@ matrix:
- rvm: ruby-head
- rvm: jruby-head
- rvm: 1.9.3
- rvm: rbx
- rvm: rbx-3

env:
global:
Expand Down
2 changes: 1 addition & 1 deletion spec/concurrent/actor_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module Actor

# FIXME better tests!

describe 'Concurrent::Actor', edge: true do
describe 'Concurrent::Actor', edge: true, if: !defined?(JRUBY_VERSION) do

def terminate_actors(*actors)
actors.each do |actor|
Expand Down
2 changes: 1 addition & 1 deletion spec/concurrent/edge/promises_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ def behaves_as_delay(delay, value)
end

describe 'interoperability' do
it 'with actor' do
it 'with actor', if: !defined?(JRUBY_VERSION) do
actor = Concurrent::Actor::Utils::AdHoc.spawn :doubler do
-> v { v * 2 }
end
Expand Down

0 comments on commit d3ce358

Please sign in to comment.