From 3e59c44cea1cced17344c130d1a50a61b20e30bf Mon Sep 17 00:00:00 2001
From: Tim Carey-Smith <tim@spork.in>
Date: Sun, 6 Oct 2013 17:58:25 +1300
Subject: [PATCH] Use new celluloid/test.rb

This reverts commit 1e24e783a041d64bef2550287f6272ed7cf491ba.
---
 sidekiq.gemspec | 2 +-
 test/helper.rb  | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/sidekiq.gemspec b/sidekiq.gemspec
index 7913d536..afefe79a 100644
--- a/sidekiq.gemspec
+++ b/sidekiq.gemspec
@@ -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'
diff --git a/test/helper.rb b/test/helper.rb
index bf7fd751..37c6a011 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -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