Skip to content

Commit 4cfc0a1

Browse files
authored
Merge pull request #940 from ruby-concurrency/jruby-compatibility
JRuby compatibility
2 parents 45870b4 + b3427a2 commit 4cfc0a1

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

spec/concurrent/channel/integration_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
end
6767

6868
specify 'default-selection.rb', notravis: true do
69+
(pending('flaky on JRuby'); fails) if Concurrent.on_jruby?
6970
expected = <<-STDOUT
7071
.
7172
.

spec/concurrent/executor/ruby_thread_pool_executor_spec.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ module Concurrent
2323

2424
it_should_behave_like :thread_pool_executor
2525

26-
27-
context :prune do
26+
context :prune, if: !Concurrent.on_jruby? do # pruning is flaky on JRuby
2827
subject do
2928
RubyThreadPoolExecutor.new(idletime: 5, min_threads: 2, max_threads: 10)
3029
end

spec/concurrent/executor/safe_task_executor_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ def execute
109109
end
110110

111111
it 'should return success' do
112+
(pending('possible local jump bug on JRuby https://github.com/jruby/jruby/issues/7136'); fails) if Concurrent.on_jruby?
112113
success, _value, _reason = subject
113114
expect(success).to be_truthy
114115
end
@@ -119,6 +120,7 @@ def execute
119120
end
120121

121122
it 'should return a nil reason' do
123+
(pending('possible local jump bug on JRuby https://github.com/jruby/jruby/issues/7136'); fails) if Concurrent.on_jruby?
122124
_success, _value, reason = subject
123125
expect(reason).to be_nil
124126
end

0 commit comments

Comments
 (0)