fastlane-plugin-test_center 3.14.4 → 3.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4364b9e3e49e3aa1a3bbd1e26feb07e449de72900bcd1ec3341ff8d1b0ca62ad
-  data.tar.gz: f983745b33c34838839d546aff4c4e407673c8241e72ab14b695d288792bdac4
+  metadata.gz: 513eae983cc2a800cbfe418da79a22bbff3a89aa7511e3a76ea84e9c2a241df3
+  data.tar.gz: 0f0d063b2c0a2fb8276e8a7186a0726008fe28e50c1354d1c36c91810bad674b
 SHA512:
-  metadata.gz: 1bb52a9bcc82781df58b2ab2b6dd33c1831da0b345b9b51842959b8a372e5341b773cf639e3cb884bccc426336dad01c8ff1e7fc418fad0baefe201e12c46bab
-  data.tar.gz: 8d6e6a9321e13aada993f1099f45b7317f4d4c30e8bbdfa55a35a49a1a0dd3aa6c7e06c7dd244132e37d4c149ac0a6b9f94d9198d3f0bd8ee912853fa44f773d
+  metadata.gz: cab19007a6dd5782e59641d1ef22d5d0dd5a942b58be2c5a6e9129ddb41117b06ac6a93c60a778707b1ea6a45d99c4b05fd83774835903bc451443ed79177181
+  data.tar.gz: a09815bbfb934d8295972eaa10033ad9115039d56060bb85732d60feb56ef713dce449bc7de202393f7a2392234ea7562f67ffcbc53ef17f457ff0da39bb1ca2

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

@@ -28,16 +28,23 @@ module Fastlane
         force_quit_simulator_processes if params[:quit_simulators]
 
         prepare_for_testing(params.values)
+        
+        tests_passed = true
+        summary = {}
+        if params[:build_for_testing]
+          summary = build_summary
+        else
+          coerce_destination_to_array(params)
+          platform = :mac
+          platform = :ios_simulator if Scan.config[:destination].any? { |d| d.include?('platform=iOS Simulator') }
 
-        coerce_destination_to_array(params)
-        platform = :mac
-        platform = :ios_simulator if Scan.config[:destination].any? { |d| d.include?('platform=iOS Simulator') }
+          runner_options = params.values.merge(platform: platform)
+          runner = ::TestCenter::Helper::MultiScanManager::Runner.new(runner_options)
+          tests_passed = runner.run
 
-        runner_options = params.values.merge(platform: platform)
-        runner = ::TestCenter::Helper::MultiScanManager::Runner.new(runner_options)
-        tests_passed = runner.run
+          summary = run_summary(params, tests_passed)
+        end
 
-        summary = run_summary(params, tests_passed)
         print_run_summary(summary)
 
         if params[:fail_build] && !tests_passed
@@ -101,6 +108,16 @@ module Fastlane
         # :nocov:
       end
 
+      def self.build_summary
+        {
+          result: true,
+          total_tests: 0,
+          passing_testcount: 0,
+          failed_testcount: 0,
+          total_retry_count: 0
+        }
+      end
+
       def self.run_summary(scan_options, tests_passed)
         scan_options = scan_options.clone
 

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

@@ -41,6 +41,7 @@ module TestCenter
         def setup_logcollection
           FastlaneCore::UI.verbose("> setup_logcollection")
           return unless @options[:include_simulator_logs]
+          return unless @options[:platform] == :ios_simulator
           return if Scan::Runner.method_defined?(:prelaunch_simulators)
 
           # We need to prelaunch the simulators so xcodebuild
@@ -89,16 +90,46 @@ module TestCenter
           remove_preexisting_test_result_bundles
           remote_preexisting_xcresult_bundles
 
-          tests_passed = false
+          test_results = [false]
           if should_run_tests_through_single_try?
-            tests_passed = run_tests_through_single_try
+            test_results.clear
+            setup_run_tests_for_each_device do |device_name|
+              FastlaneCore::UI.message("Single try testing for device '#{device_name}'")
+              test_results << run_tests_through_single_try
+            end
           end
 
-          unless tests_passed || @options[:try_count] < 1
+          unless test_results.all? || @options[:try_count] < 1
+            test_results.clear 
             setup_testcollector
-            tests_passed = run_test_batches
+            setup_run_tests_for_each_device do |device_name|
+              FastlaneCore::UI.message("Testing batches for device '#{device_name}'")
+              test_results << run_test_batches
+            end
           end
-          tests_passed
+          test_results.all?
+        end
+
+        def setup_run_tests_for_each_device
+          original_output_directory = @options.fetch(:output_directory, 'test_results') 
+          scan_destinations = Scan.config[:destination].clone
+          try_count = @options[:try_count]
+
+          scan_destinations.each_with_index do |destination, device_index|
+            @options[:try_count] = try_count
+            device_udid_match = destination.match(/id=(?<udid>[^,]+)/)
+            device_udid = device_udid_match[:udid] if device_udid_match
+            if scan_destinations.size > 1
+              @options[:output_directory] = File.join(original_output_directory, device_udid)
+              Scan.config[:destination].replace([destination])
+            end
+            command = "xcrun simctl list devices | grep #{device_udid}"
+            device_info = Fastlane::Actions.sh(command, log: false)
+
+            yield device_info.strip.gsub(/ \(#{device_udid}.*/, '')
+          end
+          Scan.config[:destination].replace(scan_destinations)
+          @options[:output_directory] = original_output_directory
         end
 
         def should_run_tests_through_single_try?

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

@@ -63,7 +63,9 @@ module TestCenter
         def parallel_scan_options(worker_index)
           options = @options.reject { |key| %i[device devices].include?(key) }
           options[:destination] = destination_for_worker(worker_index)
-          options[:scan_devices_override] = simulator_devices_for_worker(worker_index)
+          if @options[:platform] == :ios_simulator
+            options[:scan_devices_override] = simulator_devices_for_worker(worker_index)
+          end
           options[:buildlog_path] = buildlog_path_for_worker(worker_index) if @options[:buildlog_path]
           options[:derived_data_path] = derived_data_path_for_worker(worker_index)
           options[:batch_index] = worker_index
@@ -89,6 +91,12 @@ module TestCenter
           clones.flatten.each(&:delete)
         end
 
+        def shutdown_cloned_simulators(clones)
+          return if clones.nil?
+
+          clones.flatten.each(&:shutdown)
+        end
+
         def setup_serial_workers
           serial_scan_options = @options.reject { |key| %i[device devices].include?(key) }
           serial_scan_options[:destination] ||= Scan&.config&.fetch(:destination)
@@ -125,6 +133,7 @@ module TestCenter
             busy_workers.map(&:pid).each do |pid|
               Process.wait(pid)
             end
+            shutdown_cloned_simulators(@clones)
             busy_workers.each { |w| w.process_results }
           end
         end

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

@@ -116,9 +116,9 @@ module TestCenter
             # with their own testCases.
             if all_known_tests[testable].to_a.empty?
               FastlaneCore::UI.verbose("Unable to expand #{testable} to constituent tests")
-              expand_test_identifiers = [testable]
+              expanded_test_identifiers = [testable]
             else
-              expand_test_identifiers = all_known_tests[testable]
+              expanded_test_identifiers = all_known_tests[testable]
             end
           else
             # this is a testable and a test suite, let's expand it out to all of
@@ -131,7 +131,7 @@ module TestCenter
             end
           end
           test_identifiers.delete_at(index)
-          test_identifiers.insert(index, *expand_test_identifiers)
+          test_identifiers.insert(index, *expanded_test_identifiers)
         end
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.14.4"
+    VERSION = "3.14.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.14.4
+  version: 3.14.5
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json