fastlane-plugin-test_center 3.6.3.parallelizing.alpha.2 → 3.6.3.parallelizing.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ce72a79fa8ee214876b899076c621635f770dfab8f5ecefc9dbe229e2be7900
-  data.tar.gz: cb4710721fe5eb0c0e41d69455ac55fdc24d227fd398add40ef0df1510d6d372
+  metadata.gz: 88969e78b0565ded016db040a16b08c6bb20e9c52fbb38c1c508075748e3524d
+  data.tar.gz: 6c10a5c1a520b59f569ed6a0c7d43043f80a575919ee1c08093be1fb0322f261
 SHA512:
-  metadata.gz: aa787baa29ea8784912fe30976c155eb2b69a7bb490ac3da5fdd5d2556c71a5807ee3d17f2b036dd2307ee2b97d515bb4eedc1cdf0204e86b70b693a409bbd26
-  data.tar.gz: '09c3acd8862555aea016955840f78808bf4936fda7f041afb5c17dcd64980ffd274d46d4d825249d11ceb36143a1a864505b4717180f5ddbb3aecd4bcf1dcdee'
+  metadata.gz: 736fe26642a106929a1289c08575c8ce8b5adfc00b9de2ddbd3675a41efae8fbb9aa6478eca203f7fb74f925d4f24f23e2ffd1690b9cf8ed94e9769c82fab0cd
+  data.tar.gz: 672f48b3f962871edd9b25b9ba283026c0d1ba58e0f1e99900a419681f64cfbf33cf4db93d91656da7d830ba1e28cc251423f9e3ddf48ff43d2564cf77b15707

data/lib/fastlane/plugin/test_center/actions/multi_scan.rb

@@ -15,11 +15,9 @@ module Fastlane
             title: "Summary for multi_scan (test_center v#{Fastlane::TestCenter::VERSION})"
           )
         end
-        unless params[:test_without_building] || params[:skip_build]
-          build_for_testing(
-            params._values
-          )
-        end
+        
+        prepare_for_testing(params._values)
+        
         runner = ::TestCenter::Helper::MultiScanManager::Runner.new(params.values)
         tests_passed = runner.scan
         if params[:fail_build] && !tests_passed
@@ -85,28 +83,41 @@ module Fastlane
         }
       end
 
-      def self.build_for_testing(scan_options)
-        options_to_remove = %i[
-          try_count
-          batch_count
-          output_files
-          parallelize
-          quit_simulators
-          testrun_completed_block
-          test_without_building
-          output_types
-        ]
-        config = FastlaneCore::Configuration.create(
+      def self.prepare_for_testing(scan_options)
+        if scan_options[:test_without_building] || scan_options[:skip_build]
+          prepare_scan_config(scan_options)
+        else
+          build_for_testing(scan_options)
+        end
+      end
+
+      def self.prepare_scan_config(scan_options)
+        Scan.config ||= FastlaneCore::Configuration.create(
           Fastlane::Actions::ScanAction.available_options,
-          scan_options.merge(build_for_testing: true).reject { |k, _| options_to_remove.include?(k) }
+          scan_options.select { |k,v| %i[project workspace scheme].include?(k) }
         )
-        Fastlane::Actions::ScanAction.run(config)
-        remove_build_report_files
+      end
+
+      def self.build_for_testing(scan_options)
+          valid_scan_keys = Fastlane::Actions::ScanAction.available_options.map(&:key)
+          scan_options = scan_options.select { |k,v| valid_scan_keys.include?(k) }
+
+          Scan.config = FastlaneCore::Configuration.create(
+            Fastlane::Actions::ScanAction.available_options,
+            scan_options.merge(build_for_testing: true)
+          )
+          values = Scan.config.values(ask: false)
+          values[:xcode_path] = File.expand_path("../..", FastlaneCore::Helper.xcode_path)
+          FastlaneCore::PrintTable.print_values(
+            config: values,
+            hide_keys: [:destination, :slack_url],
+            title: "Summary for scan #{Fastlane::VERSION}"
+          )
+          Scan::Runner.new.run
+          remove_build_report_files
 
-        scan_options.merge!(
-          test_without_building: true,
-          derived_data_path: Scan.config[:derived_data_path]
-        ).delete(:build_for_testing)
+          Scan.config._values.delete(:build_for_testing)
+          scan_options[:derived_data_path] = Scan.config[:derived_data_path]
       end
 
       def self.remove_build_report_files

data/lib/fastlane/plugin/test_center/actions/restart_core_simulator_service.rb

@@ -1,15 +1,16 @@
 module Fastlane
   module Actions
-    class RestartCoreSimulatorServiceAction < Action
+    class QuitCoreSimulatorServiceAction < Action
       def self.run(params)
         launchctl_list_count = 0
+        commands = []
         while Actions.sh('launchctl list | grep com.apple.CoreSimulator.CoreSimulatorService || true', log: false) != ''
           UI.crash!('Unable to quit com.apple.CoreSimulator.CoreSimulatorService after 10 tries') if (launchctl_list_count += 1) > 10
-          commands << Actions.sh('launchctl stop com.apple.CoreSimulator.CoreSimulatorService &> /dev/null || true', log: false)
+          commands << Actions.sh('launchctl remove com.apple.CoreSimulator.CoreSimulatorService &> /dev/null || true', log: false)
           UI.verbose('Waiting for com.apple.CoreSimulator.CoreSimulatorService to quit')
-          sleep(0.25)
+          sleep(0.5)
         end
-        commands << Actions.sh('launchctl start com.apple.CoreSimulator.CoreSimulatorService &> /dev/null || true', log: false)
+        commands
       end
 
       #####################################################
@@ -17,12 +18,12 @@ module Fastlane
       #####################################################
 
       def self.description
-        "Restarts the com.apple.CoreSimulator.CoreSimulatorService."
+        "Force-quits the com.apple.CoreSimulator.CoreSimulatorService."
       end
 
       def self.details
         "Sometimes the com.apple.CoreSimulator.CoreSimulatorService can hang. " \
-        "Use this action to force-restart it."
+        "Use this action to force-quit it."
       end
 
       def self.authors

data/lib/fastlane/plugin/test_center/helper/multi_scan_manager/report_collator.rb

@@ -43,15 +43,16 @@ module TestCenter
           glob = "#{@source_reports_directory_glob}/#{@reportnamer.junit_fileglob}"
           report_files = sort_globbed_files(glob)
           if report_files.size > 1
+            collated_file =  File.absolute_path(File.join(@output_directory, @reportnamer.junit_reportname(@suffix)))
             config = create_config(
               CollateJunitReportsAction,
               {
                 reports: report_files,
-                collated_report: File.absolute_path(File.join(@output_directory, @reportnamer.junit_reportname(@suffix)))
+                collated_report: collated_file
               }
             )
             CollateJunitReportsAction.run(config)
-            delete_globbed_intermediatefiles("#{@source_reports_directory_glob}/#{@reportnamer.junit_numbered_fileglob}")
+            FileUtils.rm_rf(report_files - [collated_file])
           end
         end
 
@@ -60,15 +61,16 @@ module TestCenter
 
           report_files = sort_globbed_files("#{@source_reports_directory_glob}/#{@reportnamer.html_fileglob}")
           if report_files.size > 1
+            collated_file = File.absolute_path(File.join(@output_directory, @reportnamer.html_reportname(@suffix)))
             config = create_config(
               CollateJunitReportsAction,
               {
                 reports: report_files,
-                collated_report: File.absolute_path(File.join(@output_directory, @reportnamer.html_reportname(@suffix)))
+                collated_report: collated_file
               }
             )
             CollateHtmlReportsAction.run(config)
-            delete_globbed_intermediatefiles("#{@source_reports_directory_glob}/#{@reportnamer.html_numbered_fileglob}")
+            FileUtils.rm_rf(report_files - [collated_file])
           end
         end
 
@@ -76,17 +78,17 @@ module TestCenter
           return unless @reportnamer.includes_json?
 
           report_files = sort_globbed_files("#{@source_reports_directory_glob}/#{@reportnamer.json_fileglob}")
-
           if report_files.size > 1
+            collated_file = File.absolute_path(File.join(@output_directory, @reportnamer.json_reportname(@suffix)))
             config = create_config(
               CollateJsonReportsAction,
               {
                 reports: report_files,
-                collated_report: File.absolute_path(File.join(@output_directory, @reportnamer.json_reportname(@suffix)))
+                collated_report: collated_file
               }
             )
             CollateJsonReportsAction.run(config)
-            delete_globbed_intermediatefiles("#{@source_reports_directory_glob}/#{@reportnamer.json_numbered_fileglob}")
+            FileUtils.rm_rf(report_files - [collated_file])
           end
         end
 
@@ -94,17 +96,17 @@ module TestCenter
           return unless @result_bundle
 
           test_result_bundlepaths = sort_globbed_files("#{@source_reports_directory_glob}/#{@scheme}*.test_result")
-
           if test_result_bundlepaths.size > 1
+            collated_test_result_bundlepath = File.absolute_path("#{File.join(@output_directory, @scheme)}.test_result'")
             config = create_config(
               CollateTestResultBundlesAction,
               {
                 bundles: test_result_bundlepaths,
-                collated_bundle: "#{File.join(@output_directory, @scheme)}.test_result'"
+                collated_bundle: collated_test_result_bundlepath
               }
             )
             CollateTestResultBundlesAction.run(config)
-            delete_globbed_intermediatefiles("#{@source_reports_directory_glob}/#{@scheme}-[1-9]*.test_result")
+            FileUtils.rm_rf(report_files - [collated_test_result_bundlepath])
           end
         end
       end

data/lib/fastlane/plugin/test_center/helper/multi_scan_manager/retrying_scan.rb

@@ -1,26 +1,14 @@
 module TestCenter
   module Helper
     module MultiScanManager
+
       class RetryingScan
         def initialize(options = {})
           @options = options
           @retrying_scan_helper = RetryingScanHelper.new(options)
         end
 
-        def delete_xcresults
-          derived_data_path = File.expand_path(scan_config[:derived_data_path])
-          xcresults = Dir.glob("#{derived_data_path}/Logs/Test/*.xcresult")
-          FastlaneCore::UI.message("Deleting xcresults: #{xcresults}")
-          FileUtils.rm_rf(xcresults)
-        end
-
         def scan_config
-          if Scan.config.nil?
-            Scan.config = FastlaneCore::Configuration.create(
-              Fastlane::Actions::ScanAction.available_options,
-              @options.select { |k,v| %i[project workspace scheme].include?(k) }
-            )
-          end
           Scan.config
         end
 
@@ -29,9 +17,8 @@ module TestCenter
           scan_options = @options.select { |k,v| valid_scan_keys.include?(k) }
                                   .merge(@retrying_scan_helper.scan_options)
 
-          sc = scan_config
           scan_options.each do |k,v|
-            sc.set(k,v) unless v.nil?
+            scan_config.set(k,v) unless v.nil?
           end
         end
 
@@ -41,7 +28,14 @@ module TestCenter
             # TODO move delete_xcresults to `before_testrun`
             @retrying_scan_helper.before_testrun
             update_scan_options
-            delete_xcresults # has to be performed _after_ moving a *.test_result
+            
+            values = scan_config.values(ask: false)
+            values[:xcode_path] = File.expand_path("../..", FastlaneCore::Helper.xcode_path)
+            FastlaneCore::PrintTable.print_values(
+              config: values,
+              hide_keys: [:destination, :slack_url],
+              title: "Summary for scan #{Fastlane::VERSION}"
+            ) unless FastlaneCore::Helper.test?
 
             Scan::Runner.new.run
             @retrying_scan_helper.after_testrun

data/lib/fastlane/plugin/test_center/helper/multi_scan_manager/retrying_scan_helper.rb

@@ -13,20 +13,36 @@ module TestCenter
           @options = options
           @testrun_count = 0
           @xcpretty_json_file_output = ENV['XCPRETTY_JSON_FILE_OUTPUT']
-
           @reportnamer = ReportNameHelper.new(
-            options[:output_types],
-            options[:output_files],
-            options[:custom_report_file_name]
+            @options[:output_types],
+            @options[:output_files],
+            @options[:custom_report_file_name]
           )
         end
         
         def before_testrun
           remove_preexisting_test_result_bundles
+          delete_xcresults # has to be performed _after_ moving a *.test_result
+
           set_json_env
           print_starting_scan_message
         end
 
+        def delete_xcresults
+          derived_data_path = File.expand_path(@options[:derived_data_path] || Scan.config[:derived_data_path])
+          xcresults = Dir.glob("#{derived_data_path}/Logs/Test/*.xcresult")
+          FastlaneCore::UI.message("Deleting xcresults: #{xcresults}")
+          FileUtils.rm_rf(xcresults)
+        end
+
+        def output_directory
+          absolute_output_directory = File.absolute_path(@options[:output_directory])
+          if @options[:batch]
+            absolute_output_directory = File.join(absolute_output_directory, "batch-#{@options[:batch]}")
+          end
+          absolute_output_directory
+        end
+
         def print_starting_scan_message
           scan_message = "Starting scan ##{@testrun_count + 1} with #{@options.fetch(:only_testing, []).size} tests"
           scan_message << " for batch ##{@options[:batch]}" unless @options[:batch].nil?
@@ -37,7 +53,7 @@ module TestCenter
           return unless @reportnamer.includes_json?
 
           ENV['XCPRETTY_JSON_FILE_OUTPUT'] = File.join(
-            @options[:output_directory],
+            output_directory,
             @reportnamer.json_last_reportname
           )
         end
@@ -51,8 +67,7 @@ module TestCenter
         def remove_preexisting_test_result_bundles
           return unless @options[:result_bundle]
 
-          absolute_output_directory = File.absolute_path(@options[:output_directory])
-          glob_pattern = "#{absolute_output_directory}/*.test_result"
+          glob_pattern = "#{output_directory}/*.test_result"
           preexisting_test_result_bundles = Dir.glob(glob_pattern)
           FileUtils.rm_rf(preexisting_test_result_bundles)
         end
@@ -61,6 +76,7 @@ module TestCenter
           valid_scan_keys = Fastlane::Actions::ScanAction.available_options.map(&:key)
           @options.select { |k,v| valid_scan_keys.include?(k) }
                   .merge(@reportnamer.scan_options)
+                  .merge(output_directory: output_directory)
         end
 
         # after_testrun methods
@@ -74,25 +90,25 @@ module TestCenter
           else
             handle_success
           end
+          collate_reports
         end
 
         def handle_success
           send_callback_testrun_info
           move_test_result_bundle_for_next_run
           reset_json_env
-          collate_reports
         end
         
         def collate_reports
-          absolute_output_directory = File.absolute_path(@options[:output_directory])
 
-          TestCenter::Helper::MultiScanManager::ReportCollator.new(
-            source_reports_directory_glob: absolute_output_directory,
-            output_directory: absolute_output_directory,
+          report_collator_options = {
+            source_reports_directory_glob: output_directory,
+            output_directory: output_directory,
             reportnamer: @reportnamer,
             scheme: @options[:scheme],
             result_bundle: @options[:result_bundle]
-          ).collate
+          }
+          TestCenter::Helper::MultiScanManager::ReportCollator.new(report_collator_options).collate
         end
 
         def handle_test_failure
@@ -109,7 +125,7 @@ module TestCenter
           report_filepath = nil
           junit_results = {}
           unless additional_info.key?(:test_operation_failure)
-            report_filepath = File.absolute_path(File.join(@options[:output_directory], @reportnamer.junit_last_reportname))
+            report_filepath = File.join(output_directory, @reportnamer.junit_last_reportname)
   
             config = FastlaneCore::Configuration.create(
               Fastlane::Actions::TestsFromJunitAction.available_options,
@@ -123,23 +139,23 @@ module TestCenter
           info = {
             failed: junit_results[:failed],
             passing: junit_results[:passing],
-            batch: 1,
+            batch: @options[:batch] || 1,
             try_count: @testrun_count,
             report_filepath: report_filepath
           }.merge(additional_info)
 
           if @reportnamer.includes_html?
-            html_report_filepath = File.join(@options[:output_directory], @reportnamer.html_last_reportname)
+            html_report_filepath = File.join(output_directory, @reportnamer.html_last_reportname)
             info[:html_report_filepath] = html_report_filepath
           end
           if @reportnamer.includes_json?
-            json_report_filepath = File.join(@options[:output_directory], @reportnamer.json_last_reportname)
+            json_report_filepath = File.join(output_directory, @reportnamer.json_last_reportname)
             info[:json_report_filepath] = json_report_filepath
           end
           if @options[:result_bundle]
             test_result_suffix = '.test_result'
             test_result_suffix.prepend("-#{@reportnamer.report_count}") unless @reportnamer.report_count.zero?
-            test_result_bundlepath = File.join(@options[:output_directory], @options[:scheme]) + test_result_suffix
+            test_result_bundlepath = File.join(output_directory, @options[:scheme]) + test_result_suffix
             info[:test_result_bundlepath] = test_result_bundlepath
           end
           @options[:testrun_completed_block].call(info)
@@ -157,7 +173,7 @@ module TestCenter
         end
 
         def update_only_testing
-          report_filepath = File.join(@options[:output_directory], @reportnamer.junit_last_reportname)
+          report_filepath = File.join(output_directory, @reportnamer.junit_last_reportname)
           config = FastlaneCore::Configuration.create(
             Fastlane::Actions::TestsFromJunitAction.available_options,
             {
@@ -217,8 +233,7 @@ module TestCenter
         def move_test_result_bundle_for_next_run
           return unless @options[:result_bundle]
 
-          absolute_output_directory = File.absolute_path(@options[:output_directory])
-          glob_pattern = "#{absolute_output_directory}/*.test_result"
+          glob_pattern = "#{output_directory}/*.test_result"
           preexisting_test_result_bundles = Dir.glob(glob_pattern)
           unnumbered_test_result_bundles = preexisting_test_result_bundles.reject do |test_result|
             test_result =~ /.*-\d+\.test_result/

data/lib/fastlane/plugin/test_center/helper/multi_scan_manager/runner.rb

@@ -58,16 +58,10 @@ module TestCenter
         def scan
           all_tests_passed = true
           @testables_count = @test_collector.testables.size
+          FileUtils.rm_rf(Dir.glob("#{@output_directory}/**/*.{junit,html,xml,json}"))
           all_tests_passed = each_batch do |test_batch, current_batch_index|
             if ENV['USE_REFACTORED_PARALLELIZED_MULTI_SCAN']
-              retrying_scan = TestCenter::Helper::MultiScanManager::RetryingScan.new(
-                @scan_options.merge(
-                  only_testing: test_batch.map(&:shellsafe_testidentifier),
-                  output_directory: @output_directory,
-                  try_count: @try_count
-                ).reject { |key| %i[device devices].include?(key) }
-              )
-              retrying_scan.run
+              run_test_batch_through_retrying_scan(test_batch, current_batch_index)
             else
               output_directory = testrun_output_directory(@output_directory, test_batch, current_batch_index)
               reset_for_new_testable(output_directory)
@@ -94,9 +88,45 @@ module TestCenter
             end
             testrun_passed && all_tests_passed
           end
+          if ENV['USE_REFACTORED_PARALLELIZED_MULTI_SCAN']
+            collate_batched_reports
+          end
           all_tests_passed
         end
 
+        def run_test_batch_through_retrying_scan(test_batch, current_batch_index)
+          FastlaneCore::UI.important("Investigate using rbspy for perf problems: https://github.com/rbspy/rbspy")
+          retrying_scan = TestCenter::Helper::MultiScanManager::RetryingScan.new(
+            @scan_options.merge(
+              only_testing: test_batch.map(&:shellsafe_testidentifier),
+              output_directory: @output_directory,
+              try_count: @try_count,
+              batch: current_batch_index + 1
+            ).reject { |key| %i[device devices].include?(key) }
+          )
+          retrying_scan.run
+        end
+  
+        def collate_batched_reports
+          return unless @batch_count > 1
+
+          absolute_output_directory = File.absolute_path(@output_directory)
+          source_reports_directory_glob = File.join(absolute_output_directory, "batch-*")
+
+          TestCenter::Helper::MultiScanManager::ReportCollator.new(
+            source_reports_directory_glob: source_reports_directory_glob,
+            output_directory: absolute_output_directory,
+            reportnamer: @reportnamer = ReportNameHelper.new(
+              @given_output_types,
+              @given_output_files,
+              @given_custom_report_file_name
+            ),
+            scheme: @scan_options[:scheme],
+            result_bundle: @scan_options[:result_bundle]
+          ).collate
+          FileUtils.rm_rf(Dir.glob(source_reports_directory_glob))
+        end
+
         def each_batch
           tests_passed = true
           if @parallelize

data/lib/fastlane/plugin/test_center/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.6.3.parallelizing.alpha.2"
+    VERSION = "3.6.3.parallelizing.alpha.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.6.3.parallelizing.alpha.2
+  version: 3.6.3.parallelizing.alpha.3
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json