parallel_cucumber 0.2.17 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5664f82c63144d99bec9dc1880905601d0de45b2431b929eee77c0c4abb4521f
-  data.tar.gz: 9c5fce5710b7a36270c5f84431bc32195bf54a37779380ea584e04f892b8e616
+  metadata.gz: 4d312aab611528ffc08d935c5871ba120f18e27364de8ab2bd5ea42183e4ce46
+  data.tar.gz: 9c5f960b08d8b2f03fc937387bb735ca447791b49381c803f9d34811eb35ee9e
 SHA512:
-  metadata.gz: c51f9ebe8c466e9e31936ddf59bc1944f5ddab128e317d4185b4047d7d7c2f63f091c242556ac2185bd67bbd3de7145fe31fbb3fc51239e56b1b046b3412087e
-  data.tar.gz: bac0d600b9e52aacc815a7ad2e3138470c5efafa2aad96d4c94ba82bae7d82df2bdd48ce21b2b78b09c98045f1f40e3e13b760ef371a8f16babd7bfdeef180c4
+  metadata.gz: c79e25152a7f1f991b8dbc407904b8421e0eca3cc8fc45cf2217d5f0e3d39fff716310b38f77380b0d91c46bc3819002a37b735dcb8bcd0c894628827bdf4a8c
+  data.tar.gz: f4a846cf322989b8c60d95b23e3b744408c73729aecb8f12919479c21c636f35868060aaa7afb20e1d2b54472df06f022f22529ac97f874cae8d0741c804518a

data/lib/parallel_cucumber/cli.rb

@@ -8,7 +8,6 @@ module ParallelCucumber
       batch_size: 1,
       batch_timeout: 600,
       setup_timeout: 30,
-      precheck_timeout: 30,
       batch_error_timeout: 30,
       cucumber_options: '',
       debug: false,
@@ -90,10 +89,6 @@ module ParallelCucumber
           options[:test_command] = test_command
         end
 
-        opts.on('--pre-batch-check COMMAND', 'Command causing worker to quit on exit failure') do |pre_check|
-          options[:pre_check] = pre_check
-        end
-
         opts.on('--log-dir DIR', 'Directory for worker logfiles') do |log_dir|
           options[:log_dir] = log_dir
         end
@@ -173,13 +168,6 @@ module ParallelCucumber
           options[:batch_timeout] = batch_timeout
         end
 
-        help_message = <<-TEXT.gsub(/\s+/, ' ').strip
-          Timeout for each test precheck. Default is #{DEFAULTS[:batch_timeout]}
-        TEXT
-        opts.on('--precheck-timeout SECONDS', Float, help_message) do |timeout|
-          options[:precheck_timeout] = timeout
-        end
-
         help_message = <<-TEXT.gsub(/\s+/, ' ').strip
           Timeout for each batch_error script. Default is #{DEFAULTS[:batch_error_timeout]}
         TEXT

data/lib/parallel_cucumber/dsl.rb

@@ -23,6 +23,10 @@ module ParallelCucumber
         Hooks.register_after_batch(proc)
       end
 
+      def worker_health_check(&proc)
+        Hooks.register_worker_health_check(proc)
+      end
+
       def before_workers(&proc)
         Hooks.register_before_workers(proc)
       end
@@ -34,6 +38,10 @@ module ParallelCucumber
       def on_batch_error(&proc)
         Hooks.register_on_batch_error(proc)
       end
+
+      def on_dry_run_error(&proc)
+        Hooks.register_on_dry_run_error(proc)
+      end
     end
   end
 end

data/lib/parallel_cucumber/helper/cucumber/cucumber.rb

@@ -26,25 +26,32 @@ module ParallelCucumber
 
         def parse_json_report(json_report)
           report = JSON.parse(json_report, symbolize_names: true)
-          report.map do |scenario, cucumber_status|
-            status = case cucumber_status
-                       when 'failed'
-                         Status::FAILED
-                       when 'passed'
-                         Status::PASSED
-                       when 'pending'
-                         Status::PENDING
-                       when 'skipped'
-                         Status::SKIPPED
-                       when 'undefined'
-                         Status::UNDEFINED
-                       when 'unknown'
-                         Status::UNKNOWN
-                       else
-                         Status::UNKNOWN
-                     end
-            [scenario, status]
-          end.to_h
+          report.each do |scenario, details|
+            report[scenario][:status] = case details[:status]
+                                        when 'failed'
+                                          Status::FAILED
+                                        when 'passed'
+                                          Status::PASSED
+                                        when 'pending'
+                                          Status::PENDING
+                                        when 'skipped'
+                                          Status::SKIPPED
+                                        when 'undefined'
+                                          Status::UNDEFINED
+                                        when 'unknown'
+                                          Status::UNKNOWN
+                                        else
+                                          Status::UNKNOWN
+                                        end
+          end
+          report
+        end
+
+        def unknown_result(tests)
+          res = tests.map do |test|
+            [test.to_sym, {status: ::ParallelCucumber::Status::UNKNOWN}]
+          end
+          res.to_h
         end
 
         private
@@ -57,7 +64,7 @@ module ParallelCucumber
           options = remove_strict_flag(options)
           content = nil
 
-          Tempfile.open(%w(dry-run .json)) do |f|
+          Tempfile.open(%w[dry-run .json]) do |f|
             dry_run_options = "--dry-run --format ParallelCucumber::Helper::Cucumber::JsonStatusFormatter --out #{f.path}"
 
             cmd = "cucumber #{options} #{dry_run_options} #{args_string}"

data/lib/parallel_cucumber/helper/cucumber/json_status_formatter.rb

@@ -15,7 +15,13 @@ module ParallelCucumber
         end
 
         def on_after_test_case(event)
-          @result[event.test_case.location.to_s] = event.result.to_sym
+          details = {status: event.result.to_sym}
+          if event.result.respond_to?(:exception)
+            details[:exception_classname] = event.result.exception.class.to_s
+            details[:exception_message] = event.result.exception.message
+          end
+          details[:finish_time] = Time.now.to_i
+          @result[event.test_case.location.to_s] = details
         end
 
         def on_finished_testing(*)

data/lib/parallel_cucumber/hooks.rb

@@ -1,12 +1,19 @@
 module ParallelCucumber
   class Hooks
-    @before_batch_hooks ||= []
-    @after_batch_hooks  ||= []
-    @before_workers     ||= []
-    @after_workers      ||= []
-    @on_batch_error     ||= []
+    @worker_health_check ||= []
+    @before_batch_hooks  ||= []
+    @after_batch_hooks   ||= []
+    @before_workers      ||= []
+    @after_workers       ||= []
+    @on_batch_error      ||= []
+    @on_dry_run_error    ||= []
 
     class << self
+      def register_worker_health_check(proc)
+        raise(ArgumentError, 'Please provide a valid callback') unless proc.respond_to?(:call)
+        @worker_health_check << proc
+      end
+
       def register_before_batch(proc)
         raise(ArgumentError, 'Please provide a valid callback') unless proc.respond_to?(:call)
         @before_batch_hooks << proc
@@ -32,6 +39,17 @@ module ParallelCucumber
         @on_batch_error << proc
       end
 
+      def register_on_dry_run_error(proc)
+        raise(ArgumentError, 'Please provide a valid callback') unless proc.respond_to?(:call)
+        @on_dry_run_error << proc
+      end
+
+      def fire_worker_health_check(*args)
+        @worker_health_check.each do |hook|
+          hook.call(*args)
+        end
+      end
+
       def fire_before_batch_hooks(*args)
         @before_batch_hooks.each do |hook|
           hook.call(*args)
@@ -61,6 +79,12 @@ module ParallelCucumber
           hook.call(*args)
         end
       end
+
+      def fire_on_dry_run_error(error)
+        @on_dry_run_error.each do |hook|
+          hook.call(error)
+        end
+      end
     end
   end
 end

data/lib/parallel_cucumber/main.rb

@@ -30,8 +30,12 @@ module ParallelCucumber
         exit(1)
       end
 
-      all_tests = Helper::Cucumber.selected_tests(@options[:cucumber_options], @options[:cucumber_args])
-
+      begin
+        all_tests = Helper::Cucumber.selected_tests(@options[:cucumber_options], @options[:cucumber_args])
+      rescue StandardError => error
+        Hooks.fire_on_dry_run_error(error)
+        raise error
+      end
       if all_tests.empty?
         @logger.info('There is no tests to run, exiting...')
         exit(0)
@@ -98,7 +102,7 @@ module ParallelCucumber
 
         status_totals = Status.constants.map do |status|
           status = Status.const_get(status)
-          tests_with_status = results.select { |_t, s| s == status }.keys
+          tests_with_status = results.select { |_t, s| s[:status] == status }.keys
           [status, tests_with_status]
         end.to_h
 

data/lib/parallel_cucumber/version.rb

@@ -1,3 +1,3 @@
 module ParallelCucumber
-  VERSION = '0.2.17'.freeze
+  VERSION = '0.2.22'.freeze
 end

data/lib/parallel_cucumber/worker.rb

@@ -10,11 +10,9 @@ module ParallelCucumber
       @group_by = options[:group_by]
       @batch_timeout = options[:batch_timeout]
       @batch_error_timeout = options[:batch_error_timeout]
-      @precheck_timeout = options[:precheck_timeout]
       @setup_timeout = options[:setup_timeout]
       @cucumber_options = options[:cucumber_options]
       @test_command = options[:test_command]
-      @pre_check = options[:pre_check]
       @index = index
       @name = "W#{@index}"
       @setup_worker = options[:setup_worker]
@@ -99,12 +97,7 @@ module ParallelCucumber
               job = @jobs_queue.pop(false)
               case job.type
               when Job::PRECHECK
-                precmd = precheck(env)
-                if (m = precmd.match(/precmd:retry-after-(\d+)-seconds/))
-                  @manager.inform_idle(@name)
-                  sleep(1 + m[1].to_i)
-                  next
-                end
+                Hooks.fire_worker_health_check(env)
                 @manager.inform_healthy(@name)
               when Job::RUN_TESTS
                 run_batch(env, results, running_total, job.details)
@@ -161,22 +154,10 @@ module ParallelCucumber
       @logger.update_into(@stdout_logger)
     end
 
-    def precheck(env)
-      return 'default no-op pre_check' unless @pre_check
-      begin
-        return Helper::Command.exec_command(
-          env, 'precheck', @pre_check, @logger, @log_decoration, timeout: @precheck_timeout, capture: true
-        )
-      rescue
-        @logger.error('Pre-check failed: quitting immediately')
-        raise 'Pre-check failed: quitting immediately'
-      end
-    end
-
     def running_totals(batch_results, running_total)
       batch_info = Status.constants.map do |status|
         status = Status.const_get(status)
-        [status, batch_results.select { |_t, s| s == status }.keys]
+        [status, batch_results.select { |_t, s| s[:status] == status }.keys]
       end.to_h
       batch_info.each do |s, tt|
         @logger.info("#{s.to_s.upcase} #{tt.count} tests: #{tt.join(' ')}") unless tt.empty?
@@ -191,7 +172,7 @@ module ParallelCucumber
       test_syms = tests.map(&:to_sym)
       unrun = test_syms - batch_keys
       surfeit = batch_keys - test_syms
-      unrun.each { |test| batch_results[test] = Status::UNKNOWN }
+      unrun.each { |test| batch_results[test][:status] = Status::UNKNOWN }
       surfeit.each { |test| batch_results.delete(test) }
       @logger.error("Did not run #{unrun.count}/#{tests.count}: #{unrun.join(' ')}") unless unrun.empty?
       @logger.error("Extraneous runs (#{surfeit.count}): #{surfeit.join(' ')}") unless surfeit.empty?
@@ -232,7 +213,7 @@ module ParallelCucumber
           @logger.warn("There was exception in on_batch_error hook #{exc.message} \n #{trace}")
         end
 
-        return tests.map { |t| [t, ::ParallelCucumber::Status::UNKNOWN] }.to_h
+        return Helper::Cucumber.unknown_result(tests)
       end
       parse_results(test_state, tests)
     ensure
@@ -291,18 +272,18 @@ module ParallelCucumber
     def parse_results(f, tests)
       unless File.file?(f)
         @logger.error("Results file does not exist: #{f}")
-        return tests.map { |t| [t, ::ParallelCucumber::Status::UNKNOWN] }.to_h
+        return Helper::Cucumber.unknown_result(tests)
       end
       json_report = File.read(f)
       if json_report.empty?
         @logger.error("Results file is empty: #{f}")
-        return tests.map { |t| [t, ::ParallelCucumber::Status::UNKNOWN] }.to_h
+        return Helper::Cucumber.unknown_result(tests)
       end
       Helper::Cucumber.parse_json_report(json_report)
     rescue => e
       trace = e.backtrace.join("\n\t").sub("\n\t", ": #{$ERROR_INFO}#{e.class ? " (#{e.class})" : ''}\n\t")
       @logger.error("Threw: JSON parse of results caused #{trace}")
-      tests.map { |t| [t, ::ParallelCucumber::Status::UNKNOWN] }.to_h
+      Helper::Cucumber.unknown_result(tests)
     end
   end
 end

data/lib/parallel_cucumber/worker_manager.rb

@@ -39,7 +39,7 @@ module ParallelCucumber
     def create_workers(number_of_workers)
       number_of_workers.times do |index|
         @workers["W#{index}"] =
-            ParallelCucumber::Worker.new(options: @options, index: index, stdout_logger: @logger, manager: self)
+          ParallelCucumber::Worker.new(options: @options, index: index, stdout_logger: @logger, manager: self)
       end
     end
 
@@ -51,11 +51,11 @@ module ParallelCucumber
             give_job_to_healthy_worker
           elsif any_worker_busy?
             kill_surplus_workers
-            sleep 0.5
           else
             kill_all_workers
             break
           end
+          sleep 0.5
         end
       end
     end
@@ -67,10 +67,15 @@ module ParallelCucumber
         puts "Starting W#{index}"
         @workers["W#{index}"].start(env_for_worker(@options[:env_variables], index))
       end
-      @results.inject(:merge) # Returns hash of file:line to statuses + :worker-index to summary.
+      @results.inject do |seed, result|
+        seed.merge(result) do |_key, oldval, newval|
+          (newval[:finish_time] > oldval[:finish_time]) ? newval : oldval
+        end
+      end
     end
 
     def kill_all_workers
+      @logger.info('=== Killing All Workers')
       @workers.values.each { |w| w.assign_job(Job.new(Job::DIE)) }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_cucumber
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.22
 platform: ruby
 authors:
 - Alexander Bayandin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Run cucumber in parallel