1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00

Merge pull request #1233 from mperham/celluloid-test

Use new celluloid/test.rb
This commit is contained in:
Mike Perham 2013-10-06 17:48:29 -07:00
commit f52c6e9f4f
2 changed files with 3 additions and 8 deletions

View file

@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
gem.add_dependency 'redis', '>= 3.0.4'
gem.add_dependency 'redis-namespace', '>= 1.3.1'
gem.add_dependency 'connection_pool', '>= 1.0.0'
gem.add_dependency 'celluloid', '>= 0.15.1'
gem.add_dependency 'celluloid', '>= 0.15.2'
gem.add_dependency 'json'
gem.add_development_dependency 'sinatra'
gem.add_development_dependency 'minitest', '~> 4.2'

View file

@ -20,7 +20,8 @@ end
require 'minitest/autorun'
require 'minitest/pride'
require 'celluloid/autostart'
require 'celluloid/test'
Celluloid.boot
require 'sidekiq'
require 'sidekiq/util'
Sidekiq.logger.level = Logger::ERROR
@ -34,9 +35,3 @@ REDIS = Sidekiq::RedisConnection.create(:url => redis_url, :namespace => 'testy'
Sidekiq.configure_client do |config|
config.redis = { :url => redis_url, :namespace => 'testy' }
end
Celluloid.class_eval do
def self.shutdown
$stderr.puts "Celluloid shutdown disabled"
end
end