pool_spec.rb in spool-1.0.3

- old
+ new

@@ -16,11 +16,11 @@
 
   def start_pool(&block)
     @pool = Spool::Pool.new(&block).tap do |pool|
       t = Thread.new { pool.start }
       t.abort_on_exception = true
-      while pool.processes.count < pool.configuration.processes
+      while pool.all_processes.count < pool.configuration.processes
         sleep 0.01
       end
     end
   end
 
@@ -38,135 +38,135 @@
       command 'ruby -e "loop do; sleep 1; end"'
       stop_signal :TERM
     end
 
     pool.must_be :running?
-    pool.processes.count.must_equal 1
-    pool.processes[0].must_be :alive?
+    pool.all_processes.count.must_equal 1
+    pool.all_processes[0].must_be :alive?
 
-    process = pool.processes[0]
+    process = pool.all_processes[0]
     pool.stop
 
     while pool.running?
       sleep SLEEP_TIME
     end 
 
     pool.must_be :stopped?
-    pool.processes.must_be_empty
+    pool.all_processes.must_be_empty
     process.wont_be :alive?
   end
 
   it 'Start and force stop' do
     pool = start_pool do
       processes 1
       command 'ruby -e "loop do; sleep 1; end"'
     end
 
     pool.must_be :running?
-    pool.processes.count.must_equal 1
-    pool.processes[0].must_be :alive?
+    pool.all_processes.count.must_equal 1
+    pool.all_processes[0].must_be :alive?
 
-    process = pool.processes[0]
+    process = pool.all_processes[0]
 
     pool.stop!
 
     while pool.running?
       sleep SLEEP_TIME
     end 
 
     pool.must_be :stopped?
-    pool.processes.must_be_empty
+    pool.all_processes.must_be_empty
     process.wont_be :alive?
   end
 
   it 'Recover killed process' do
     pool = start_pool do
       processes 1
       command 'ruby -e "loop do; sleep 1; end"'
     end
 
-    original_process = pool.processes[0]
+    original_process = pool.all_processes[0]
     original_process.send_signal :KILL
 
     begin
       sleep SLEEP_TIME
-      new_pid = pool.processes.any? ? pool.processes[0].pid : original_process.pid
+      new_pid = pool.all_processes.any? ? pool.all_processes[0].pid : original_process.pid
     end while original_process.pid == new_pid
     
     original_process.wont_be :alive?
 
-    pool.processes.count.must_equal 1
-    pool.processes[0].must_be :alive?
+    pool.all_processes.count.must_equal 1
+    pool.all_processes[0].must_be :alive?
   end
 
   it 'Restart processes' do
     pool = start_pool do
       processes 2
       command 'ruby -e "loop do; sleep 1; end"'
       stop_signal :TERM
     end
 
-    pool.processes.count.must_equal 2
+    pool.all_processes.count.must_equal 2
 
-    original_pids = pool.processes.map(&:pid)
+    original_pids = pool.all_processes.map(&:pid)
     
     pool.restart
     
     begin
       sleep SLEEP_TIME
-      new_pids = (pool.processes.count == 2) ? pool.processes.map(&:pid) : original_pids
+      new_pids = (pool.all_processes.count == 2) ? pool.all_processes.map(&:pid) : original_pids
     end until (original_pids & new_pids).empty?
 
-    pool.processes.each { |p| p.must_be :alive?}
+    pool.all_processes.each { |p| p.must_be :alive?}
   end
 
   it 'Stop with timeout' do
     pool = start_pool do
       processes 1
       command 'ruby -e "Signal.trap(:QUIT) { puts :quit; sleep 5; exit 0 }; loop { sleep 1 }"'
       stop_signal :QUIT
     end
 
-    process = pool.processes[0]
+    process = pool.all_processes[0]
 
     Benchmark.realtime do 
       pool.stop 0.1
       while pool.running?
         sleep SLEEP_TIME
       end 
     end.must_be :<, 1
 
     pool.must_be :stopped?
-    pool.processes.must_be_empty    
+    pool.all_processes.must_be_empty    
     process.wont_be :alive?
   end
 
   it 'Increase processes' do
     pool = start_pool do
       processes 1
       command 'ruby -e "loop do; sleep 1; end"'
     end
 
-    pool.processes.count.must_equal 1
+    pool.all_processes.count.must_equal 1
 
     pool.incr 2
 
-    assert_with_timeout(1) { pool.processes.count == 3 }
+    assert_with_timeout(1) { pool.all_processes.count == 3 }
   end
 
   it 'Decrease processes' do
     pool = start_pool do
       processes 3
       command 'ruby -e "loop do; sleep 1; end"'
       stop_signal :TERM
     end
 
-    pool.processes.count.must_equal 3
+    pool.all_processes.count.must_equal 3
 
     pool.decr 2
 
-    assert_with_timeout(1) { pool.processes.count == 1 }
+    assert_with_timeout(1) { pool.all_processes.count == 1 }
   end
 
   it 'Change process when satisfied stop condition' do
     file_name = File.expand_path 'used_memory.log'
     ruby_command = %Q{
@@ -185,43 +185,43 @@
       command "ruby -e \"#{ruby_command}\""
       restart_when { |p| p.memory > 300 }
       stop_signal :TERM
     end
 
-    original_process = pool.processes[0]
+    original_process = pool.all_processes[0]
 
     begin
       sleep SLEEP_TIME
-      new_pid = pool.processes.any? ? pool.processes[0].pid : original_process.pid
+      new_pid = pool.all_processes.any? ? pool.all_processes[0].pid : original_process.pid
     end while original_process.pid == new_pid
 
     text_file = File.read(file_name)
     File.delete(file_name) 
 
     text_file.must_equal 'Finished'
-    pool.processes.count.must_equal 1
+    pool.all_processes.count.must_equal 1
   end
 
   it 'Reload config' do
     config_file = File.expand_path('../loop_pool_config.rb', __FILE__)
     config = Spool::DSL.configure config_file
 
     pool = Spool::Pool.new(config).tap do |pool|
       t = Thread.new { pool.start }
       t.abort_on_exception = true
-      while pool.processes.count < pool.configuration.processes
+      while pool.all_processes.count < pool.configuration.processes
       end
     end
 
-    pool.processes.count.must_equal 1
+    pool.all_processes.count.must_equal 1
 
     pool.incr 1
 
-    assert_with_timeout(1) { pool.processes.count == 2 }
+    assert_with_timeout(1) { pool.all_processes.count == 2 }
     
     pool.reload
 
-    assert_with_timeout(1) { pool.processes.count == 1 }
+    assert_with_timeout(1) { pool.all_processes.count == 1 }
 
     pool.stop!
   end
 
 end
\ No newline at end of file