mini_autobot 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 304864d910ed49b64b576de654ff04d5173e534b
-  data.tar.gz: c7b5881befcfedf13e325e0f3581d7066bd4d04b
+  metadata.gz: 8cc67ceef5896e0d638609b72025a40233cd24ab
+  data.tar.gz: b0f4a4bc84afd272d3b969c93f157cbfe9617496
 SHA512:
-  metadata.gz: 1b57d2ea5b02d55fe7e14e886d32f9ea8cdc7541394bd647297365633171fed553c200ecc101aa67cf81cb91d14d3925d1e46c7d013c3e1f5578249ffbaed208
-  data.tar.gz: f14c61b84e901e72cf1d53cdd3cad30004af1b8ece8d9719efbcf0ecf3f429d081013ac7e902053236517d0fec52bfdd4d987301e743ed5fc9b404aff23a163b
+  metadata.gz: 0ae15ae997a355a466464bb92fab425ab82e28e1f4b94b5853873d2bbe69a79207e9075f52d37623e4f660a8bc357cf298229850ec41825fd32e84a449053586
+  data.tar.gz: 52cfa030069a7dfa2c7dfc45d36743dbe445965b7f2b90d90638fbb89b87f4f2d1075c7376202bfe8f672fc48cd53ac4a9a77241daf9e5e168e23d830906647e

data/lib/mini_autobot/parallel.rb

@@ -23,8 +23,7 @@ module MiniAutobot
     # return true only if specified to run on mac in connector
     # @return [boolean]
     def run_on_mac?
-      return true if @platform.include?('osx')
-      return false
+      @platform.include?('osx')
     end
 
     # remove all results files under logs/tap_results/
@@ -34,9 +33,8 @@ module MiniAutobot
     end
 
     def count_autobot_process
-      counting_process = IO.popen "ps -ef | grep '#{@static_run_command}' -c"
-      count_of_processes = counting_process.readlines[0].to_i
-      count_of_processes
+      counting_process_output = IO.popen "ps -ef | grep 'bin/#{@static_run_command}' -c"
+      counting_process_output.readlines[0].to_i - 1 # minus grep process
     end
 
     # run multiple commands with logging to start multiple tests in parallel
@@ -48,7 +46,7 @@ module MiniAutobot
         if run_on_mac?
           @simultaneous_jobs = 10 # saucelabs account limit for parallel is 10 for mac
         else
-          @simultaneous_jobs = 15 # saucelabs account limit for parallel is 15 for non-mac
+          @simultaneous_jobs = 20 # saucelabs account limit for parallel is 15 for non-mac
         end
       end
 
@@ -65,62 +63,55 @@ module MiniAutobot
         keep_running_full(all_to_run)
       end
 
-      wait_all_done_saucelabs if @on_sauce
-      wait_for_pids(@pids) unless ENV['JENKINS_HOME']
+      Process.waitall
       puts "\nAll Complete! Started at #{@start_time} and finished at #{Time.now}\n"
       exit
     end
 
-    def wait_for_pids(pids)
-      running_pids = pids # assume all pids are running at this moment
-      while running_pids.size > 1
-        sleep 5
-        puts "running_pids = #{running_pids}"
-        running_pids.each do |pid|
-          unless process_running?(pid)
-            puts "#{pid} is not running, removing it from pool"
-            running_pids.delete(pid)
-          end
-        end
-      end
-    end
-
-    def process_running?(pid)
-      begin
-        Process.getpgid(pid)
-        true
-      rescue Errno::ESRCH
-        false
-      end
-    end
-
     # runs each test from a test set in a separate child process
     def run_test_set(test_set)
       test_set.each do |test|
         run_command = "#{@static_run_command} -n #{test} #{@pipe_tap} > logs/tap_results/#{test}.t"
         pipe = IO.popen(run_command)
         puts "Running #{test}  #{pipe.pid}"
-        @pids << pipe.pid
       end
     end
 
+    # recursively keep running #{simultaneous_jobs} number of tests in parallel
+    # exit when no test left to run
     def keep_running_full(all_to_run)
-      full_count = simultaneous_jobs + 2
-      running_count = count_autobot_process
-      while running_count >= full_count
+      running_subprocess_count = count_autobot_process - 1 # minus parent process
+      puts "WARNING: running_subprocess_count = #{running_subprocess_count}
+            is more than what it is supposed to run(#{simultaneous_jobs}),
+            notify mini_autobot maintainers" if running_subprocess_count > simultaneous_jobs + 1
+      while running_subprocess_count >= simultaneous_jobs
         sleep 5
-        running_count = count_autobot_process
+        running_subprocess_count = count_autobot_process - 1
       end
-      to_run_count = full_count - running_count
+      to_run_count = simultaneous_jobs - running_subprocess_count
       tests_to_run = all_to_run.slice!(0, to_run_count)
+
       run_test_set(tests_to_run)
-      if all_to_run.size > 0
-        keep_running_full(all_to_run)
-      else
-        return
+
+      keep_running_full(all_to_run) if all_to_run.size > 0
+    end
+
+    # @deprecated Use more native wait/check of Process
+    def wait_for_pids(pids)
+      running_pids = pids # assume all pids are running at this moment
+      while running_pids.size > 1
+        sleep 5
+        puts "running_pids = #{running_pids}"
+        running_pids.each do |pid|
+          unless process_running?(pid)
+            puts "#{pid} is not running, removing it from pool"
+            running_pids.delete(pid)
+          end
+        end
       end
     end
 
+    # @deprecated Too time consuming and fragile, should use more native wait/check of Process
     def wait_all_done_saucelabs
       size = all_tests.size
       job_statuses = saucelabs_last_n_statuses(size)
@@ -131,6 +122,8 @@ module MiniAutobot
       end
     end
 
+    private
+
     # call saucelabs REST API to get last #{limit} jobs' statuses
     # possible job status: complete, error, in progress
     def saucelabs_last_n_statuses(limit)
@@ -193,5 +186,14 @@ module MiniAutobot
       end
     end
 
+    def process_running?(pid)
+      begin
+        Process.getpgid(pid)
+        true
+      rescue Errno::ESRCH
+        false
+      end
+    end
+
   end
 end

data/lib/mini_autobot/version.rb

@@ -1,3 +1,3 @@
 module MiniAutobot
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_autobot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ripta Pasay
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport