spec/spec_helper.rb in celluloid-0.15.1 vs spec/spec_helper.rb in celluloid-0.15.2

@@ -1,11 +1,10 @@
 require 'coveralls'
 Coveralls.wear!
 
 require 'rubygems'
 require 'bundler/setup'
-require 'celluloid'
 require 'celluloid/rspec'
 
 logfile = File.open(File.expand_path("../../log/test.log", __FILE__), 'a')
 logfile.sync = true
 
@@ -19,13 +18,14 @@
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 
   config.before do
     Celluloid.logger = logger
-    Celluloid.shutdown
-    sleep 0.01
-
-    Celluloid.internal_pool.assert_inactive
+    if Celluloid.running?
+      Celluloid.shutdown
+      sleep 0.01
+      Celluloid.internal_pool.assert_inactive
+    end
 
     Celluloid.boot
   end
 end