spec/support/loose_threads.rb in celluloid-0.17.1.2 vs spec/support/loose_threads.rb in celluloid-0.17.2

@@ -2,10 +2,15 @@
   class << self
     def loose_threads
       Thread.list.map do |thread|
         next unless thread
         next if thread == Thread.current
+
+        # TODO: Remove Specs::ALLOW_SLOW_MAILBOXES hax.
+        #       Allows slow shutdown of mailboxes.
+        #       Find more graceful way to do shutdown.
+
         if RUBY_PLATFORM == "java"
           # Avoid disrupting jRuby's "fiber" threads.
           name = thread.to_java.getNativeThread.get_name
           next if /Fiber/ =~ name
           next unless /^Ruby-/ =~ name
@@ -14,29 +19,35 @@
           next if backtrace.empty? # possibly a timer thread
         end
 
         if RUBY_ENGINE == "rbx"
           # Avoid disrupting Rubinious thread
-          next if thread.backtrace.empty?
           next if thread.backtrace.first =~ %r{rubysl/timeout/timeout\.rb}
+
+          if Specs::ALLOW_SLOW_MAILBOXES
+            if thread.backtrace.first =~ /wait/
+              next if thread.backtrace[1] =~ /mailbox\.rb/ && thread.backtrace[1] =~ /check/
+            end
+          end
         end
 
         if RUBY_ENGINE == "ruby"
           # Sometimes stays
-          next if thread.backtrace.first =~ %r{/timeout\.rb}
+          next if thread.backtrace.nil?
+          next unless thread.backtrace.is_a?(Array)
+          next if thread.backtrace.empty?
+          next if thread.backtrace.first =~ /timeout\.rb/
+
+          if Specs::ALLOW_SLOW_MAILBOXES
+            next if thread.backtrace[1] =~ /mailbox\.rb/ && thread.backtrace[1] =~ /sleep/
+          end
         end
 
         thread
       end.compact
     end
 
-    def assert_no_loose_threads(location)
-      Specs.assert_no_loose_threads!("before example: #{location}")
-      yield
-      Specs.assert_no_loose_threads!("after example: #{location}")
-    end
-
     def thread_name(thread)
       (RUBY_PLATFORM == "java") ? thread.to_java.getNativeThread.get_name : ""
     end
 
     def assert_no_loose_threads!(location)
@@ -56,10 +67,10 @@
 
         STDERR.puts "Sleeping so you can investigate on the Java side...."
         sleep
       end
 
-      fail "Aborted due to runaway threads (#{location})\n"\
+      fail Celluloid::ThreadLeak, "Aborted due to runaway threads (#{location})\n"\
         "List: (#{loose.map(&:inspect)})\n:#{backtraces.join("\n")}"
     end
   end
 end