Merge remote-tracking branch 'origin/master'

Conflicts: test/Gemfile.lock test/batch_run.rb
iron-io · Jul 13, 2012 · 3ab2596 · 3ab2596
2 parents 58ec24f + d51a42b
commit 3ab2596
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/test/batch_run.rb b/test/batch_run.rb
@@ -13,8 +13,8 @@ def test_concur_batch
     old_log_level = IronWorker.logger.level
     IronWorker.logger.level = Logger::INFO
 
-    clz = MqWorker
+    clz = OneLineWorker
-    num_tasks = 50
+    num_tasks = 100
 
     worker = clz.new
     worker.upload

diff --git a/test/test_scheduling.rb b/test/test_scheduling.rb
@@ -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)

diff --git a/test/test_scheduling_no_active_support.rb b/test/test_scheduling_no_active_support.rb
@@ -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)