fastlane-plugin-test_center 3.9.0 → 3.9.1.b.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dd99b394133508622e5daab51025772002b0b0369e6b7cfd04055dbb51cc0aa
-  data.tar.gz: 30abd18975a3259a86ded79a1e466b386f86ef5f56cab4fefa04397bc80fa25a
+  metadata.gz: 1046d5102edf4921dec9466f721da07edffa749f3f24fe597873f8542a37d52b
+  data.tar.gz: f269d6a491a84575b7442c9a7642ee69dc3005b596c682a5aa30d19eb76a67d9
 SHA512:
-  metadata.gz: 225ffa3158f7bf9b8bea8c6d47c897d4926e003a90f4eae9cd4f6cb1074e5de3943bcaf4111d2d819b611260503f9c2fb537cb334fd8d0ee07c0f501dc75b136
-  data.tar.gz: 449cb428920924775c5aa28c236d367c34453e0ef68d534981c03f8292eb0e8a582043c4992b28e3dff4d21dee6fd96957d2280d39322f34c19a26845aa0e3df
+  metadata.gz: e1cf6be83ddcff5317cd8681aa44e36c3d24e061abdff7fad5c47ec883a91ec09d15ff24eb8727141dacdd04c88327f057bcbdb9ac3504a29b85b26608a6689b
+  data.tar.gz: d8c2523c66da3b53c937720ac16d46d1c4b97953b3940db29a418eeab7a8f9342a72c4d0a1a4882928ac3a7c925806eed9c22c3f78baab49c0416360be96276b

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

@@ -14,25 +14,17 @@ module Fastlane
     class MultiScanAction < Action
       def self.run(params)
         params[:quit_simulators] = params._values[:force_quit_simulator] if params._values[:force_quit_simulator]
-        if params[:output_types]
-          params[:output_types] = params[:output_types].split(',').map(&:strip).join(',')
-        end
-        if params[:output_files]
-          params[:output_files] = params[:output_files].split(',').map(&:strip).join(',')
-        end
 
-        if FastlaneCore::Helper.xcode_at_least?('11.0.0')
-          if params[:result_bundle]
-            UI.important('As of Xcode 11, test_result bundles created in the output directory are actually symbolic links to an xcresult bundle')
-          end
-        elsif params[:output_types]&.include?('xcresult')
-          UI.important("The 'xcresult' :output_type is only supported for Xcode 11 and greater. You are using #{FastlaneCore::Helper.xcode_version}.")
-        end
+        strip_leading_and_trailing_whitespace_from_output_types(params)
+
+        warn_of_xcode11_result_bundle_incompatability(params)
+        warn_of_parallelism_with_circle_ci(params)
+
         print_multi_scan_parameters(params)
         force_quit_simulator_processes if params[:quit_simulators]
 
         prepare_for_testing(params.values)
-        
+
         coerce_destination_to_array(params)
         platform = :mac
         platform = :ios_simulator if Scan.config[:destination].any? { |d| d.include?('platform=iOS Simulator') }
@@ -43,17 +35,43 @@ module Fastlane
 
         summary = run_summary(params, tests_passed)
         print_run_summary(summary)
-        
+
         if params[:fail_build] && !tests_passed
           raise UI.test_failure!('Tests have failed')
         end
         summary
       end
 
+      def self.warn_of_parallelism_with_circle_ci(params)
+        if params[:parallel_testrun_count] > 1 && Helper.is_circle_ci?
+          UI.important("Warning: problems have occurreed when running parallel simulators on Circle CI.")
+          UI.message("  See https://github.com/lyndsey-ferguson/fastlane-plugin-test_center/issues/179")
+        end
+      end
+
+      def self.strip_leading_and_trailing_whitespace_from_output_types(params)
+        if params[:output_types]
+          params[:output_types] = params[:output_types].split(',').map(&:strip).join(',')
+        end
+        if params[:output_files]
+          params[:output_files] = params[:output_files].split(',').map(&:strip).join(',')
+        end
+      end
+
+      def self.warn_of_xcode11_result_bundle_incompatability(params)
+        if FastlaneCore::Helper.xcode_at_least?('11.0.0')
+          if params[:result_bundle]
+            UI.important('As of Xcode 11, test_result bundles created in the output directory are actually symbolic links to an xcresult bundle')
+          end
+        elsif params[:output_types]&.include?('xcresult')
+          UI.important("The 'xcresult' :output_type is only supported for Xcode 11 and greater. You are using #{FastlaneCore::Helper.xcode_version}.")
+        end
+      end
+
       def self.coerce_destination_to_array(params)
         destination = params[:destination] || Scan.config[:destination] || []
         unless destination.kind_of?(Array)
-          params[:destination] = Scan.config[:destination] = [destination] 
+          params[:destination] = Scan.config[:destination] = [destination]
         end
       end
 
@@ -68,7 +86,7 @@ module Fastlane
         # :nocov:
       end
 
-      def self.print_run_summary(summary)        
+      def self.print_run_summary(summary)
         return if Helper.test?
 
         # :nocov:
@@ -147,6 +165,7 @@ module Fastlane
       def self.prepare_for_testing(scan_options)
         reset_scan_config_to_defaults
         use_scanfile_to_override_settings(scan_options)
+        turn_off_concurrent_workers(scan_options)
         ScanHelper.remove_preexisting_simulator_logs(scan_options)
         if scan_options[:test_without_building] || scan_options[:skip_build]
           UI.verbose("Preparing Scan config options for multi_scan testing")
@@ -157,6 +176,12 @@ module Fastlane
         end
       end
 
+      def self.turn_off_concurrent_workers(scan_options)
+        if Gem::Version.new(Fastlane::VERSION) >= Gem::Version.new('2.142.0')
+          scan_options.delete(:concurrent_workers) if scan_options[:concurrent_workers].to_i > 0
+        end
+      end
+
       def self.reset_scan_config_to_defaults
         return unless Scan.config
 
@@ -173,7 +198,7 @@ module Fastlane
         overridden_options = ScanHelper.options_from_configuration_file(
           ScanHelper.scan_options_from_multi_scan_options(scan_options)
         )
-        
+
         unless overridden_options.empty?
           FastlaneCore::UI.important("Scanfile found: overriding multi_scan options with it's values.")
           overridden_options.each do |k,v|
@@ -303,6 +328,13 @@ module Fastlane
               UI.user_error!("Error: Batch counts must be greater than zero") unless count > 0
             end
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :retry_test_runner_failures,
+            description: "Set to true If you want to treat build failures during testing, like 'Test runner exited before starting test execution', as 'all tests failed'",
+            type: Boolean,
+            default_value: false,
+            optional: true
+          ),
           FastlaneCore::ConfigItem.new(
             key: :invocation_based_tests,
             description: "Set to true If your test suit have invocation based tests like Kiwi",
@@ -374,7 +406,7 @@ module Fastlane
           UI.important(
             'example: ' \\
             'split the tests into 4 batches and run each batch of tests in ' \\
-            'parallel up to 3 times if tests fail. Abort the testing early ' \\ 
+            'parallel up to 3 times if tests fail. Abort the testing early ' \\
             'if there are too many failing tests by passing in a ' \\
             ':testrun_completed_block that is called by :multi_scan ' \\
             'after each run of tests.'

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

@@ -88,11 +88,12 @@ module TestCenter
 
         def scan_options
           valid_scan_keys = Fastlane::Actions::ScanAction.available_options.map(&:key)
-          xcargs = @options[:xcargs]
+          xcargs = @options[:xcargs] || ''
           if xcargs&.include?('build-for-testing')
             FastlaneCore::UI.important(":xcargs, #{xcargs}, contained 'build-for-testing', removing it")
             xcargs.slice!('build-for-testing')
           end
+          xcargs.gsub!(/-parallel-testing-enabled(=|\s+)(YES|NO)/, '')
           retrying_scan_options = @reportnamer.scan_options.merge(
             {
               output_directory: output_directory,
@@ -125,7 +126,11 @@ module TestCenter
             after_testrun_message << " for batch ##{@options[:batch]}" unless @options[:batch].nil?
             FastlaneCore::UI.verbose(after_testrun_message)
 
-            handle_build_failure(exception)
+            if @options[:retry_test_runner_failures]
+              continue_with_build_failure(exception)
+            else
+              handle_build_failure(exception)
+            end
           else
             after_testrun_message = "Scan passed the tests"
             after_testrun_message << " for batch ##{@options[:batch]}" unless @options[:batch].nil?
@@ -240,12 +245,27 @@ module TestCenter
               junit: File.absolute_path(report_filepath)
             }
           )
-          @options[:only_testing] = Fastlane::Actions::TestsFromJunitAction.run(config)[:failed].map(&:shellsafe_testidentifier)
+          @options[:only_testing] = @options[:only_testing] - Fastlane::Actions::TestsFromJunitAction.run(config).fetch(:passing, Hash.new).map(&:shellsafe_testidentifier)
           if @options[:invocation_based_tests]
             @options[:only_testing] = @options[:only_testing].map(&:strip_testcase).uniq
           end
         end
 
+        def continue_with_build_failure(exception)
+          test_session_last_messages = last_lines_of_test_session_log
+          failure = retrieve_test_operation_failure(test_session_last_messages)
+          case failure
+          when /Lost connection to testmanagerd/
+            FastlaneCore::UI.important("com.apple.CoreSimulator.CoreSimulatorService may have become corrupt, consider quitting it")
+            if @options[:quit_core_simulator_service]
+              Fastlane::Actions::RestartCoreSimulatorServiceAction.run
+            end
+          else
+            FastlaneCore::UI.important(test_session_last_messages)
+          end
+          send_callback_testrun_info(test_operation_failure: failure)
+        end
+
         def handle_build_failure(exception)
           test_session_last_messages = last_lines_of_test_session_log
           failure = retrieve_test_operation_failure(test_session_last_messages)
@@ -262,11 +282,31 @@ module TestCenter
             FastlaneCore::UI.error(test_session_last_messages)
             send_callback_testrun_info(test_operation_failure: failure)
             raise exception
+            FastlaneCore::UI.important(test_session_last_messages)
           end
           send_callback_testrun_info(test_operation_failure: failure)
         end
 
         def retrieve_test_operation_failure(test_session_last_messages)
+          if FastlaneCore::Helper.xcode_at_least?(11)
+            retrieve_test_operation_failure_post_xcode11(test_session_last_messages)
+          else
+            retrieve_test_operation_failure_pre_xcode11(test_session_last_messages)
+          end
+        end
+
+        def retrieve_test_operation_failure_post_xcode11(test_session_last_messages)
+          if /Connection peer refused channel request/ =~ test_session_last_messages
+            test_operation_failure = 'Lost connection to testmanagerd'
+          elsif /Please unlock your device and reattach/ =~ test_session_last_messages
+            test_operation_failure = 'Test device locked'
+          elsif /Test runner exited before starting test execution/ =~ test_session_last_messages
+            test_operation_failure = 'Test runner exited before starting test execution'
+          end
+          test_operation_failure
+        end
+
+        def retrieve_test_operation_failure_pre_xcode11(test_session_last_messages)
           test_operation_failure_match = /Test operation failure: (?<test_operation_failure>.*)$/ =~ test_session_last_messages
           if test_operation_failure_match.nil?
             test_operation_failure = 'Unknown test operation failure'

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

@@ -7,7 +7,7 @@ module TestCenter
       require 'json'
       require 'shellwords'
       require 'snapshot/reset_simulators'
-      
+
       class Runner
         attr_reader :retry_total_count
 
@@ -66,12 +66,12 @@ module TestCenter
           end
 
           unless tests_passed || @options[:try_count] < 1
-            setup_testcollector  
+            setup_testcollector
             tests_passed = run_test_batches
           end
           tests_passed
         end
-        
+
         def should_run_tests_through_single_try?
           should_run_for_invocation_tests = @options[:invocation_based_tests] && @options[:only_testing].nil?
           should_run_for_skip_build = @options[:skip_build]
@@ -114,16 +114,16 @@ module TestCenter
           end
           @options[:output_directory] = output_directory
           @options[:destination] = Scan.config[:destination]
-          
+
           # We do not want Scan.config to _not_ have :device :devices, we want to
           # use :destination. We remove :force_quit_simulator as we do not want
           # Scan to handle it as multi_scan takes care of it in its own way
           options = @options.reject { |key| %i[device devices force_quit_simulator].include?(key) }
           options[:try_count] = 1
-  
+
           tests_passed = RetryingScan.run(options)
           @options[:try_count] -= 1
-          
+
           reportnamer = ReportNameHelper.new(
             @options[:output_types],
             @options[:output_files],
@@ -138,12 +138,12 @@ module TestCenter
           )
           @options[:only_testing] = retrieve_failed_single_try_tests
           @options[:only_testing] = @options[:only_testing].map(&:strip_testcase).uniq
-          
+
           symlink_result_bundle_to_xcresult(output_directory, reportnamer)
 
           tests_passed
         end
-        
+
         def retrieve_failed_single_try_tests
           reportnamer = ReportNameHelper.new(
             @options[:output_types],
@@ -168,10 +168,10 @@ module TestCenter
 
           pool = TestBatchWorkerPool.new(pool_options)
           pool.setup_workers
-          
+
           remaining_test_batches = @test_collector.test_batches.clone
           remaining_test_batches.each_with_index do |test_batch, current_batch_index|
-            worker = pool.wait_for_worker              
+            worker = pool.wait_for_worker
             FastlaneCore::UI.message("Starting test run #{current_batch_index + 1}")
             worker.run(scan_options_for_worker(test_batch, current_batch_index))
           end
@@ -189,7 +189,7 @@ module TestCenter
             batch: batch_index + 1
           }
         end
-  
+
         def collate_batched_reports
           return unless @batch_count > 1
           return unless @options[:collate_reports]

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

@@ -16,11 +16,22 @@ module TestCenter
           cloned_simulators = []
 
           run_count = @options[:parallel_testrun_count] || 0
-          destination_simulator_ids = Scan.config[:destination].map do |destination|
-            destination.split(',id=').last
-          end
           original_simulators = FastlaneCore::DeviceManager.simulators('iOS').find_all do |simulator|
-            destination_simulator_ids.include?(simulator.udid)
+            found_match = false
+            Scan.config[:destination].each do |destination|
+              match = destination.match(/id=(?<udid>[^,]+)/)
+              if match
+                found_match = (match[:udid] == simulator.udid)
+              else
+                match = destination.match(/name=(?<name>[^,]+)/)
+                name = match[:name] || ''
+                match = destination.match(/OS=(?<os_version>[^,]+)/)
+                os_version = match[:os_version] || ''
+
+                found_match = (name == simulator.name && os_version == simulator.os_version)
+              end
+            end
+            found_match
           end
           original_simulators.each(&:shutdown)
           (0...run_count).each do |batch_index|

data/lib/fastlane/plugin/test_center/helper/test_collector.rb

@@ -80,7 +80,7 @@ module TestCenter
               known_tests += xctestrun_known_tests[testable]
               test_components = test.split('/')
               testsuite = test_components.size == 1 ? test_components[0] : test_components[1]
-              @testables_tests[testable][index] = known_tests.select { |known_test| known_test.include?(testsuite) } 
+              @testables_tests[testable][index] = known_tests.select { |known_test| known_test.include?(testsuite) }
             end
           end
           @testables_tests[testable].flatten!
@@ -106,7 +106,7 @@ module TestCenter
             end
           end
         end
-        
+
         @testables_tests
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.9.0"
+    VERSION = "3.9.1.b.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.9.1.b.1
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -302,9 +302,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
 signing_key: