Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #6020 from 7even/test_queue_order
Rails::Queueing::TestQueue run order
  • Loading branch information
tenderlove committed Apr 27, 2012
2 parents 4dcaffb + 804db94 commit 3ca7b13
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion railties/lib/rails/queueing.rb
Expand Up @@ -18,7 +18,7 @@ def drain
# run the jobs in a separate thread so assumptions of synchronous
# jobs are caught in test mode.
t = Thread.new do
while job = @contents.pop
while job = @contents.shift
job.run
end
end
Expand Down
13 changes: 13 additions & 0 deletions railties/test/queueing/test_queue_test.rb
Expand Up @@ -25,6 +25,19 @@ def test_contents
assert_equal [job], @queue.contents
end

def test_order
time1 = time2 = nil

job1 = Job.new(1) { time1 = Time.now }
job2 = Job.new(2) { time2 = Time.now }

@queue.push job1
@queue.push job2
@queue.drain

assert time1 < time2, "Jobs run in the same order they were added"
end

def test_drain
t = nil
ran = false
Expand Down

0 comments on commit 3ca7b13

Please sign in to comment.