bucky-core 0.10.17 → 0.10.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 828c8502067f7be7e163f12084d0eac329201a51ce95eff6b72b4385fbd508c3
-  data.tar.gz: e705af8f1174573260b267e5b9be4636562ca893a7c667007bed1fdca7b21cc3
+  metadata.gz: a8eba9ce6bd69f4ed90867a049e82f324128c64b53df120afbebf486142c457f
+  data.tar.gz: e32d0ec926283e7ea08ef362abec3835e4a1ad5f66e85300125ce32bb0341ff5
 SHA512:
-  metadata.gz: 1159630606ed77a9b95882e4ad7209c278b3845b7f7c1f130a4d7c078f78b3275bfd3801d1018ac4e85cda167b5914a3d5b975060de44669a35112074d7102d8
-  data.tar.gz: 645d3ff4b6208182f0dbd466a3127c8914f56c7ba9b9be57bd94cd8d5c3487a660afac543fa8b36259fcc5d272e3a89816bb0bb103cdbd0aa2b208423b3a2411
+  metadata.gz: c02632d7578c12965152be6b08d94cbe7b7ef81b7cfcb95d17edd340988722cbb907fb79ca9c01c35954c7e56da00edb0bb59128e0bddb0afc6ceacacb80a4fc
+  data.tar.gz: 5b86f9033fe8144f8358e5cdf5f561c3f79e1d590492b0237700fe7e688205838baf8b4eb9b121c056d38428cd8c4a1012cb9537ebf8de14b5ba326a9d5d609d

data/.circleci/config.yml

@@ -27,7 +27,7 @@ jobs:
           command: docker load -q -i ~/caches/images.tar
       - run:
           name: docker up
-          command: docker-compose -f docker-compose.system-test.yml up --no-build -d
+          command: docker-compose -f docker-compose.system-test.yml up -d
       - run:
           name: execute system testing
           command: 'circleci tests glob system_testing/testing_code/*.bats | xargs -n 1 -I {} docker exec bucky-core bats "/bucky-core/"{} | circleci tests split'

data/README.md

@@ -98,6 +98,7 @@ ENV_FOO=foo bucky run -t e2e -d
     -r, --re_test_count RE_TEST_COUNT # How many round you run tests
     -l, --label LABEL_NAME
     -m, --link_check_max_times MAX_TIMES # Works only with which category is linkstatus
+    -o, --out JSON_OUTPUT_FILE_PATH # Output summary report by json
 ```
 
 ### Rerun test
@@ -212,6 +213,7 @@ test_category: linkstatus
 exclude_urls:
   - https://example.com/fuga/?hoge=1 # PERFECT MATCHING
   - https://example.com/fuga/* # PARTIAL MATCHING
+  - /https://example.com/.*\.html/ # REGULAR EXPRESSION MATCHING
 cases:
   - case_name: test_code_1 # Suite filename + number
     desc: status check for top page

data/exe/bucky

@@ -89,7 +89,9 @@ end
 opts.on('-m', '--link_check_max_times') do |v|
   test_cond[:link_check_max_times] = v.to_i
 end
-
+opts.on('-o', '--out JSON_OUTPUT_FILE_PATH') do |v|
+  test_cond[:out] = v
+end
 lint_cond = {}
 opts.on('-C', '--category CATEGORY_NAME') do |v|
   lint_cond[:lint_category] = v
@@ -124,42 +126,33 @@ def bucky_home?
   File.exist?('.bucky_home')
 end
 
-current_dir = Dir.pwd
-gem_script_dir = __dir__
-
-if ARGV == RUN_COMMAND
-  error_and_exit('Not bucky project dirctory here.') unless bucky_home?
-
-  $bucky_home_dir = Dir.pwd
+def setup_test_cond(test_cond)
   # Default conditions setting conditions setting
   test_cond[:test_category] ||= 'e2e'
   test_cond[:re_test_count] = test_cond[:re_test_count] ? test_cond[:re_test_count].to_i : 1
   test_cond[:link_check_max_times] ||= 3
   # Change to array e.g.--suite_id 1,2,3 -> :suite_id=>[1,2,3]
-  test_cond.each { |k, v| test_cond[k] = v.split(',') if v.instance_of?(String) }
-  require_relative '../lib/bucky/core/test_core/test_manager'
-  Bucky::Core::TestCore::TestManager.new(test_cond).run
-  Bucky::Core::TestCore::ExitHandler.instance.bucky_exit
+  %i[suite_name case label xlabel device].each do |k|
+    test_cond[k] = test_cond[k].split(',') unless test_cond[k].nil?
+  end
+  test_cond
+end
 
-elsif ARGV == RERUN_COMMAND
+current_dir = Dir.pwd
+gem_script_dir = __dir__
+
+if ARGV[0].end_with? 'run'
+  error_and_exit('Not bucky project dirctory here.') unless bucky_home?
   $bucky_home_dir = Dir.pwd
-  # Default conditions setting conditions setting
-  test_cond[:test_category] ||= 'e2e'
-  test_cond[:link_check_max_times] ||= 3
-  test_cond[:re_test_count] = test_cond[:re_test_count] ? test_cond[:re_test_count].to_i : 1
-  # Change to array e.g.--suite_id 1,2,3 -> :suite_id=>[1,2,3]
-  test_cond.each { |k, v| test_cond[k] = v.split(',') if v.instance_of?(String) }
   require_relative '../lib/bucky/core/test_core/test_manager'
-  Bucky::Core::TestCore::TestManager.new(test_cond).rerun
+  Bucky::Core::TestCore::TestManager.new(setup_test_cond(test_cond)).send(ARGV[0])
   Bucky::Core::TestCore::ExitHandler.instance.bucky_exit
-
 elsif ARGV == LINT_COMMAND
   $bucky_home_dir = Dir.pwd
   # Default conditions setting
   lint_cond[:lint_category] ||= 'config'
   require_relative '../lib/bucky/tools/lint'
   Bucky::Tools::Lint.check(lint_cond[:lint_category])
-
 elsif ARGV[0..0] == NEW_COMMAND
   error_and_exit('No test app name.') if ARGV.length < 2
 

data/lib/bucky/core/test_core/test_case_loader.rb

@@ -34,9 +34,8 @@ module Bucky
             testcodes = []
             service = (test_cond[:service] || ['*']).first
             device = (test_cond[:device] || ['*']).first
-            category = (test_cond[:test_category] || ['*']).first
 
-            Dir.glob("#{$bucky_home_dir}/services/#{service}/#{device}/scenarios/#{category}/*.yml").each do |testcode_file|
+            Dir.glob("#{$bucky_home_dir}/services/#{service}/#{device}/scenarios/#{test_cond[:test_category]}/*.yml").each do |testcode_file|
               testcodes << load_testcode_in_file(testcode_file, test_cond)
             end
             # Delete nil element

data/lib/bucky/core/test_core/test_class_generator.rb

@@ -46,7 +46,7 @@ module Bucky
         end
 
         # Genrate test class by test suite and test case data
-        def generate_test_class(data, link_status_url_log = {})
+        def generate_test_class(data: [], linkstatus_url_log: {}, w_pipe: {})
           test_cond = @test_cond
           # Common proccessing
           # e.g.) TestSampleAppPcE2e1, TestSampleAppPcHttpstatus1
@@ -63,6 +63,7 @@ module Bucky
               match_obj = /\Atest_(.+)\(.+::(Test.+)\)\z/.match(original_name)
               "#{match_obj[1]}(#{match_obj[2]})"
             end
+            define_method(:w_pipe, proc { w_pipe })
 
             # Class structure is different for each test category
             case data[:test_category]
@@ -74,8 +75,8 @@ module Bucky
                   define_method(method_name) do
                     puts "\n#{simple_test_class_name(name)}"
                     t_case[:urls].each do |url|
-                      link_status_check_args = { url: url, device: data[:suite][:device], exclude_urls: data[:suite][:exclude_urls], link_check_max_times: test_cond[:link_check_max_times], url_log: link_status_url_log }
-                      link_status_check(link_status_check_args)
+                      linkstatus_check_args = { url: url, device: data[:suite][:device], exclude_urls: data[:suite][:exclude_urls], link_check_max_times: test_cond[:link_check_max_times], url_log: linkstatus_url_log }
+                      linkstatus_check(linkstatus_check_args)
                     end
                   end
                 )

data/lib/bucky/core/test_core/test_manager.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'parallel'
+require 'json'
 require_relative '../test_core/test_case_loader'
 require_relative '../../utils/config'
 require_relative './test_class_generator'
@@ -26,6 +26,8 @@ module Bucky
           # If child process dead, available workers increase
           Signal.trap('CLD') { available_workers += 1 }
 
+          r_pipe, w_pipe = IO.pipe
+
           data_set.each do |data|
             # Wait until worker is available and handle exit code from previous process
             unless available_workers.positive?
@@ -34,28 +36,51 @@ module Bucky
             end
             # Workers decrease when start working
             available_workers -= 1
-            fork { block.call(data) }
+            fork { block.call(data, w_pipe) }
           end
           # Handle all exit code in waitall
           Process.waitall.each do |child|
             Bucky::Core::TestCore::ExitHandler.instance.raise unless child[1].exitstatus.zero?
           end
+
+          w_pipe.close
+          results_set = collect_results_set(r_pipe)
+          r_pipe.close
+
+          results_set
         end
 
         def parallel_distribute_into_workers(data_set, max_processes, &block)
           # Group the data by remainder of index
           data_set_grouped = data_set.group_by.with_index { |_elem, index| index % max_processes }
+          r_pipe, w_pipe = IO.pipe
           # Use 'values' method to get only hash's key into an array
           data_set_grouped.values.each do |data_for_pre_worker|
             # Number of child process is equal to max_processes (or equal to data_set length when data_set length is less than max_processes)
             fork do
-              data_for_pre_worker.each { |data| block.call(data) }
+              data_for_pre_worker.each { |data| block.call(data, w_pipe) }
             end
           end
           # Handle all exit code in waitall
           Process.waitall.each do |child|
             Bucky::Core::TestCore::ExitHandler.instance.raise unless child[1].exitstatus.zero?
           end
+
+          w_pipe.close
+          results_set = collect_results_set(r_pipe)
+          r_pipe.close
+
+          results_set
+        end
+
+        def collect_results_set(r_pipe)
+          results_set = {}
+          r_pipe.each_line do |line|
+            r = JSON.parse(line)
+            results_set[r['test_class_name']] = r
+          end
+
+          results_set
         end
       end
 
@@ -69,6 +94,20 @@ module Bucky
           @tdo = Bucky::Core::Database::TestDataOperator.new
           @start_time = Time.now
           $job_id = @tdo.save_job_record_and_get_job_id(@start_time, @test_cond[:command_and_option])
+          @json_report = {
+            summary: {
+              cases_count: 0,
+              success_count: 0,
+              failure_count: 0,
+              job_id: $job_id,
+              test_category: test_cond[:test_category],
+              device: test_cond[:device],
+              labels: test_cond[:label],
+              exclude_labels: test_cond[:xlabel],
+              rerun_job_id: test_cond[:job],
+              round_count: 0
+            }
+          }
         end
 
         def run
@@ -102,25 +141,40 @@ module Bucky
           e2e_parallel_num = Bucky::Utils::Config.instance[:e2e_parallel_num]
           linkstatus_parallel_num = Bucky::Utils::Config.instance[:linkstatus_parallel_num]
           tcg = Bucky::Core::TestCore::TestClassGenerator.new(@test_cond)
-          case @test_cond[:test_category][0]
-          when 'e2e' then parallel_new_worker_each(test_suite_data, e2e_parallel_num) { |data| tcg.generate_test_class(data) }
+          case @test_cond[:test_category]
+          when 'e2e' then results_set = parallel_new_worker_each(test_suite_data, e2e_parallel_num) { |data, w_pipe| tcg.generate_test_class(data: data, w_pipe: w_pipe) }
           when 'linkstatus' then
-            link_status_url_log = {}
-            parallel_distribute_into_workers(test_suite_data, linkstatus_parallel_num) { |data| tcg.generate_test_class(data, link_status_url_log) }
+            linkstatus_url_log = {}
+            results_set = parallel_distribute_into_workers(test_suite_data, linkstatus_parallel_num) { |data, w_pipe| tcg.generate_test_class(data: data, linkstatus_url_log: linkstatus_url_log, w_pipe: w_pipe) }
           end
+
+          results_set
         end
 
         def execute_test
+          all_round_results = []
           @re_test_count.times do |i|
             Bucky::Core::TestCore::ExitHandler.instance.reset
             $round = i + 1
+            @json_report[:summary][:round_count] = $round
             test_suite_data = load_test_suites
-            do_test_suites(test_suite_data)
+            all_round_results.append(do_test_suites(test_suite_data))
             @test_cond[:re_test_cond] = @tdo.get_ng_test_cases_at_last_execution(
               is_error: 1, job_id: $job_id, round: $round
             )
             break if @test_cond[:re_test_cond].empty?
           end
+
+          return unless @test_cond[:out]
+
+          @json_report[:summary][:cases_count] = all_round_results[0].sum { |_case, res| res[:case_count] }
+          @json_report[:summary][:failure_count] = all_round_results[-1].sum { |_case, res| res[:failure_count] }
+          @json_report[:summary][:success_count] = @json_report[:summary][:cases_count] - @json_report[:summary][:failure_count]
+
+          File.open(@test_cond[:out], 'w') do |f|
+            f.puts(@json_report.to_json)
+            puts "\nSave report : #{@test_cond[:out]}\n"
+          end
         end
       end
     end

data/lib/bucky/test_equipment/test_case/abst_test_case.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'test/unit'
+require 'json'
 require_relative '../../core/test_core/test_result'
 
 module Bucky
@@ -25,6 +26,12 @@ module Bucky
         def run(result)
           super
           @@this_result.result = result unless $debug
+          w_pipe.puts({
+            test_class_name: self.class.name,
+            cases_count: result.run_count,
+            success_count: result.pass_count,
+            failure_count: result.run_count - result.pass_count
+          }.to_json)
         end
 
         def setup

data/lib/bucky/test_equipment/verifications/status_checker.rb

@@ -62,7 +62,7 @@ module Bucky
           end
         end
 
-        def link_status_check(args)
+        def linkstatus_check(args)
           url = args[:url]
           device = args[:device]
           exclude_urls = args[:exclude_urls]

data/lib/bucky/version.rb

@@ -2,6 +2,6 @@
 
 module Bucky
   module Version
-    VERSION = '0.10.17'
+    VERSION = '0.10.20'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bucky-core
 version: !ruby/object:Gem::Version
-  version: 0.10.17
+  version: 0.10.20
 platform: ruby
 authors:
 - NaotoKishino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print