Permalink
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	test/Gemfile.lock
	test/batch_run.rb
  • Loading branch information...
2 parents 58ec24f + d51a42b commit 3ab2596139969a8b714bab5a563ec9982d6c3777 @treeder treeder committed Jul 13, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 test/batch_run.rb
  2. +1 −1 test/test_scheduling.rb
  3. +1 −1 test/test_scheduling_no_active_support.rb
View
@@ -13,8 +13,8 @@ def test_concur_batch
old_log_level = IronWorker.logger.level
IronWorker.logger.level = Logger::INFO
- clz = MqWorker
- num_tasks = 50
+ clz = OneLineWorker
+ num_tasks = 100
worker = clz.new
worker.upload
View
@@ -14,7 +14,7 @@ def test_scheduler
end_time = Time.now
duration = (end_time-start_time)
puts "duration=#{duration}"
- assert duration > 30
+ assert duration > 28
worker = OneLineWorker.new
worker.schedule(:start_at=>1.seconds.from_now, :run_every=>60, :end_at=>(6*60).seconds.from_now)
@@ -14,7 +14,7 @@ def test_scheduler_no_as
end_time = Time.now
duration = (end_time-start_time)
puts "duration=#{duration}"
- assert duration > 30
+ assert duration > 28
worker = OneLineWorker.new
worker.schedule(:start_at=>Time.now.iso8601, :run_every=>60, :end_at=>(Time.now + (60*5)).iso8601)

0 comments on commit 3ab2596

Please sign in to comment.