Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix issues with jruby failing tests

  • Loading branch information...
commit 5a7c52e8e916e34aa4378eecb7b6c292a4371a00 1 parent 4ec056e
Kevin Bedell authored
Showing with 7 additions and 7 deletions.
  1. +1 −1  test/test_middleware.rb
  2. +6 −6 test/test_processor.rb
2  test/test_middleware.rb
View
@@ -82,7 +82,7 @@ def call(*args)
processor = Sidekiq::Processor.new(boss)
actor = Minitest::Mock.new
actor.expect(:processor_done, nil, [processor])
- actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+ actor.expect(:real_thread, nil, [nil, Thread])
boss.expect(:async, actor, [])
boss.expect(:async, actor, [])
processor.process(Sidekiq::BasicFetch::UnitOfWork.new('queue:default', msg))
12 test/test_processor.rb
View
@@ -31,7 +31,7 @@ def work(msg, queue='queue:default')
msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
actor = Minitest::Mock.new
actor.expect(:processor_done, nil, [@processor])
- actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+ actor.expect(:real_thread, nil, [nil, Thread])
@boss.expect(:async, actor, [])
@boss.expect(:async, actor, [])
@processor.process(work(msg))
@@ -41,7 +41,7 @@ def work(msg, queue='queue:default')
it 'passes exceptions to ExceptionHandler' do
actor = Minitest::Mock.new
- actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+ actor.expect(:real_thread, nil, [nil, Thread])
@boss.expect(:async, actor, [])
msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
begin
@@ -57,7 +57,7 @@ def work(msg, queue='queue:default')
msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
re_raise = false
actor = Minitest::Mock.new
- actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+ actor.expect(:real_thread, nil, [nil, Thread])
@boss.expect(:async, actor, [])
begin
@@ -75,7 +75,7 @@ def work(msg, queue='queue:default')
processor = ::Sidekiq::Processor.new(@boss)
actor = Minitest::Mock.new
actor.expect(:processor_done, nil, [processor])
- actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+ actor.expect(:real_thread, nil, [nil, Thread])
@boss.expect(:async, actor, [])
@boss.expect(:async, actor, [])
processor.process(work(msgstr))
@@ -103,7 +103,7 @@ def with_expire(time)
def successful_job
msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
actor = Minitest::Mock.new
- actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+ actor.expect(:real_thread, nil, [nil, Thread])
actor.expect(:processor_done, nil, [@processor])
@boss.expect(:async, actor, [])
@boss.expect(:async, actor, [])
@@ -131,7 +131,7 @@ def successful_job
def failed_job
actor = Minitest::Mock.new
- actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+ actor.expect(:real_thread, nil, [nil, Thread])
@boss.expect(:async, actor, [])
msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
begin
Please sign in to comment.
Something went wrong with that request. Please try again.