diff options
| -rw-r--r-- | activesupport/lib/active_support/queueing.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/queueing/test_queue_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/queueing.rb b/activesupport/lib/active_support/queueing.rb index d36b5c17a8..0a4ab05b78 100644 --- a/activesupport/lib/active_support/queueing.rb +++ b/activesupport/lib/active_support/queueing.rb @@ -110,7 +110,7 @@ module ActiveSupport end def drain - Thread.new { run(@queue.pop) until @queue.empty? }.join + run(@queue.pop) until @queue.empty? end def consume diff --git a/activesupport/test/queueing/test_queue_test.rb b/activesupport/test/queueing/test_queue_test.rb index 9e74bc64ee..e398a48bea 100644 --- a/activesupport/test/queueing/test_queue_test.rb +++ b/activesupport/test/queueing/test_queue_test.rb @@ -97,6 +97,6 @@ class TestQueueTest < ActiveSupport::TestCase assert @queue.empty? assert job.ran?, "The job runs synchronously when the queue is drained" - assert_not_equal job.thread_id, Thread.current.object_id + assert_equal job.thread_id, Thread.current.object_id end end |