fastlane-plugin-test_center 3.6.3.parallelizing.alpha.3 → 3.6.3.parallelizing.pre.alpha.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88969e78b0565ded016db040a16b08c6bb20e9c52fbb38c1c508075748e3524d
-  data.tar.gz: 6c10a5c1a520b59f569ed6a0c7d43043f80a575919ee1c08093be1fb0322f261
+  metadata.gz: 0b03566f2644f92ffde801c8d83a6bd009e59fd947437cf9b6ea26b737ae0996
+  data.tar.gz: 80d1d785126c154dfda7a2aee7ded8654bd58776746144550e7d37c863e126c4
 SHA512:
-  metadata.gz: 736fe26642a106929a1289c08575c8ce8b5adfc00b9de2ddbd3675a41efae8fbb9aa6478eca203f7fb74f925d4f24f23e2ffd1690b9cf8ed94e9769c82fab0cd
-  data.tar.gz: 672f48b3f962871edd9b25b9ba283026c0d1ba58e0f1e99900a419681f64cfbf33cf4db93d91656da7d830ba1e28cc251423f9e3ddf48ff43d2564cf77b15707
+  metadata.gz: 481326edd2420e6cc1f5347c434b0089b32dc526e0e09a1279fd8131855771711fb8676a3251e5d3003bb7a35dcd6ba2cb1b505d62b482395fe06ec3df4e5f3b
+  data.tar.gz: f4360d6b14dda570832bba2b9c86e127beea79f83a23fd3e4c0730e017b2f51e6216c5b0fa4ccd688fc0acd1d01d5d0376718cae53f13f402477f7aa8054ed8e

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

@@ -15,9 +15,11 @@ module Fastlane
             title: "Summary for multi_scan (test_center v#{Fastlane::TestCenter::VERSION})"
           )
         end
-        
-        prepare_for_testing(params._values)
-        
+        unless params[:test_without_building] || params[:skip_build]
+          build_for_testing(
+            params._values
+          )
+        end
         runner = ::TestCenter::Helper::MultiScanManager::Runner.new(params.values)
         tests_passed = runner.scan
         if params[:fail_build] && !tests_passed
@@ -83,41 +85,28 @@ module Fastlane
         }
       end
 
-      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(
+      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(
           Fastlane::Actions::ScanAction.available_options,
-          scan_options.select { |k,v| %i[project workspace scheme].include?(k) }
+          scan_options.merge(build_for_testing: true).reject { |k, _| options_to_remove.include?(k) }
         )
-      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
+        Fastlane::Actions::ScanAction.run(config)
+        remove_build_report_files
 
-          Scan.config._values.delete(:build_for_testing)
-          scan_options[:derived_data_path] = Scan.config[:derived_data_path]
+        scan_options.merge!(
+          test_without_building: true,
+          derived_data_path: Scan.config[:derived_data_path]
+        ).delete(:build_for_testing)
       end
 
       def self.remove_build_report_files

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

@@ -1,16 +1,15 @@
 module Fastlane
   module Actions
-    class QuitCoreSimulatorServiceAction < Action
+    class RestartCoreSimulatorServiceAction < 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 remove com.apple.CoreSimulator.CoreSimulatorService &> /dev/null || true', log: false)
+          commands << Actions.sh('launchctl stop com.apple.CoreSimulator.CoreSimulatorService &> /dev/null || true', log: false)
           UI.verbose('Waiting for com.apple.CoreSimulator.CoreSimulatorService to quit')
-          sleep(0.5)
+          sleep(0.25)
         end
-        commands
+        commands << Actions.sh('launchctl start com.apple.CoreSimulator.CoreSimulatorService &> /dev/null || true', log: false)
       end
 
       #####################################################
@@ -18,12 +17,12 @@ module Fastlane
       #####################################################
 
       def self.description
-        "Force-quits the com.apple.CoreSimulator.CoreSimulatorService."
+        "Restarts the com.apple.CoreSimulator.CoreSimulatorService."
       end
 
       def self.details
         "Sometimes the com.apple.CoreSimulator.CoreSimulatorService can hang. " \
-        "Use this action to force-quit it."
+        "Use this action to force-restart it."
       end
 
       def self.authors

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

@@ -43,16 +43,15 @@ 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: collated_file
+                collated_report: File.absolute_path(File.join(@output_directory, @reportnamer.junit_reportname(@suffix)))
               }
             )
             CollateJunitReportsAction.run(config)
-            FileUtils.rm_rf(report_files - [collated_file])
+            delete_globbed_intermediatefiles("#{@source_reports_directory_glob}/#{@reportnamer.junit_numbered_fileglob}")
           end
         end
 
@@ -61,16 +60,15 @@ 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: collated_file
+                collated_report: File.absolute_path(File.join(@output_directory, @reportnamer.html_reportname(@suffix)))
               }
             )
             CollateHtmlReportsAction.run(config)
-            FileUtils.rm_rf(report_files - [collated_file])
+            delete_globbed_intermediatefiles("#{@source_reports_directory_glob}/#{@reportnamer.html_numbered_fileglob}")
           end
         end
 
@@ -78,17 +76,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: collated_file
+                collated_report: File.absolute_path(File.join(@output_directory, @reportnamer.json_reportname(@suffix)))
               }
             )
             CollateJsonReportsAction.run(config)
-            FileUtils.rm_rf(report_files - [collated_file])
+            delete_globbed_intermediatefiles("#{@source_reports_directory_glob}/#{@reportnamer.json_numbered_fileglob}")
           end
         end
 
@@ -96,17 +94,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: collated_test_result_bundlepath
+                collated_bundle: "#{File.join(@output_directory, @scheme)}.test_result'"
               }
             )
             CollateTestResultBundlesAction.run(config)
-            FileUtils.rm_rf(report_files - [collated_test_result_bundlepath])
+            delete_globbed_intermediatefiles("#{@source_reports_directory_glob}/#{@scheme}-[1-9]*.test_result")
           end
         end
       end

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

@@ -1,14 +1,26 @@
 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
 
@@ -17,26 +29,38 @@ 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|
-            scan_config.set(k,v) unless v.nil?
+            sc.set(k,v) unless v.nil?
           end
         end
 
         def run
+          update_scan_options
+          delete_xcresults
+
           try_count = @options[:try_count] || 1
           begin
-            # TODO move delete_xcresults to `before_testrun`
             @retrying_scan_helper.before_testrun
-            update_scan_options
+
             
-            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?
 
+            # TODO: Investigate the following error:
+            """
+            2019-05-09 13:32:40.707 xcodebuild[78535:1944070] [MT] DVTAssertions: Warning in /Library/Caches/com.apple.xbs/Sources/IDEFrameworks_Fall2018/IDEFrameworks-14460.46/IDEFoundation/ProjectModel/ActionRecords/IDESchemeActionTestAttachment.m:186
+            Details:  Error writing attachment data to file /Users/lyndsey.ferguson/Library/Developer/Xcode/DerivedData/AtomicBoy-flqqvvvzbouqymbyffgdbtjoiufr/Logs/Test/Test-Transient Testing-2019.05.09_13-32-08--0400.xcresult/1_Test/Attachments/Screenshot_E0AE7940-E7F4-4CA8-BB2B-8822D730D10F.jpg: Error Domain=NSCocoaErrorDomain Code=4 \"The folder “Screenshot_E0AE7940-E7F4-4CA8-BB2B-8822D730D10F.jpg” doesn’t exist.\" UserInfo={NSFilePath=/Users/lyndsey.ferguson/Library/Developer/Xcode/DerivedData/AtomicBoy-flqqvvvzbouqymbyffgdbtjoiufr/Logs/Test/Test-Transient Testing-2019.05.09_13-32-08--0400.xcresult/1_Test/Attachments/Screenshot_E0AE7940-E7F4-4CA8-BB2B-8822D730D10F.jpg, NSUserStringVariant=Folder, NSUnderlyingError=0x7fa6ef34ef90 {Error Domain=NSPOSIXErrorDomain Code=2 \"No such file or directory\"}}
+            Object:   <IDESchemeActionTestAttachment: 0x7fa6ef22d270>
+            Method:   -_savePayload:
+            Thread:   <NSThread: 0x7fa6ea516110>{number = 1, name = main}
+            Please file a bug at https://bugreport.apple.com with this warning message and any useful information you can provide.
+
+            It may be due to:
+            2019-05-09 14:17:30.933 xcodebuild[86893:2045058]  IDETestOperationsObserverDebug: Failed to move logarchive from /Users/lyndsey.ferguson/Library/Developer/CoreSimulator/Devices/0D312041-2D60-4221-94CC-3B0040154D74/data/tmp/test-session-systemlogs-2019.05.09_14-17-04--0400.logarchive to diagnostics location /Users/lyndsey.ferguson/Library/Developer/Xcode/DerivedData/AtomicBoy-flqqvvvzbouqymbyffgdbtjoiufr/Logs/Test/Test-Transient Testing-2019.05.09_14-17-04--0400.xcresult/1_Test/Diagnostics/iPhone 5s_0D312041-2D60-4221-94CC-3B0040154D74/test-session-systemlogs-2019.05.09_14-17-04--0400.logarchive: Error Domain=NSCocoaErrorDomain Code=4 \"“test-session-systemlogs-2019.05.09_14-17-04--0400.logarchive” couldn’t be moved to “iPhone 5s_0D312041-2D60-4221-94CC-3B0040154D74” because either the former doesn’t exist, or the folder containing the latter doesn’t exist.\" UserInfo={NSSourceFilePathErrorKey=/Users/lyndsey.ferguson/Library/Developer/CoreSimulator/Devices/0D312041-2D60-4221-94CC-3B0040154D74/data/tmp/test-session-systemlogs-2019.05.09_14-17-04--0400.logarchive, NSUserStringVariant=(
+              Move
+              ), NSDestinationFilePath=/Users/lyndsey.ferguson/Library/Developer/Xcode/DerivedData/AtomicBoy-flqqvvvzbouqymbyffgdbtjoiufr/Logs/Test/Test-Transient Testing-2019.05.09_14-17-04--0400.xcresult/1_Test/Diagnostics/iPhone 5s_0D312041-2D60-4221-94CC-3B0040154D74/test-session-systemlogs-2019.05.09_14-17-04--0400.logarchive, NSFilePath=/Users/lyndsey.ferguson/Library/Developer/CoreSimulator/Devices/0D312041-2D60-4221-94CC-3B0040154D74/data/tmp/test-session-systemlogs-2019.05.09_14-17-04--0400.logarchive, NSUnderlyingError=0x7fdf96c6de90 {Error Domain=NSPOSIXErrorDomain Code=2 \"No such file or directory\"}}
+
+            """
+            update_scan_options
             Scan::Runner.new.run
             @retrying_scan_helper.after_testrun
             true
@@ -54,3 +78,16 @@ module TestCenter
     end
   end
 end
+# Ug. How do I name this class?
+# I want a class that retries a scan
+# I want a class that controls or manages the class that retries the scan and the set up for that
+# etc.
+# So, the class or the realm could be:
+# MultiScanManager
+# MultiScanController
+# ScanManager
+# ScanMaster
+# MultiScanMaster
+# MasterScanManser
+# MasterMultiScan
+# I like MultiScanManager

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

@@ -13,36 +13,20 @@ 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?
@@ -53,7 +37,7 @@ module TestCenter
           return unless @reportnamer.includes_json?
 
           ENV['XCPRETTY_JSON_FILE_OUTPUT'] = File.join(
-            output_directory,
+            @options[:output_directory],
             @reportnamer.json_last_reportname
           )
         end
@@ -67,7 +51,8 @@ module TestCenter
         def remove_preexisting_test_result_bundles
           return unless @options[:result_bundle]
 
-          glob_pattern = "#{output_directory}/*.test_result"
+          absolute_output_directory = File.absolute_path(@options[:output_directory])
+          glob_pattern = "#{absolute_output_directory}/*.test_result"
           preexisting_test_result_bundles = Dir.glob(glob_pattern)
           FileUtils.rm_rf(preexisting_test_result_bundles)
         end
@@ -76,7 +61,6 @@ 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
@@ -90,25 +74,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])
 
-          report_collator_options = {
-            source_reports_directory_glob: output_directory,
-            output_directory: output_directory,
+          TestCenter::Helper::MultiScanManager::ReportCollator.new(
+            source_reports_directory_glob: absolute_output_directory,
+            output_directory: absolute_output_directory,
             reportnamer: @reportnamer,
             scheme: @options[:scheme],
             result_bundle: @options[:result_bundle]
-          }
-          TestCenter::Helper::MultiScanManager::ReportCollator.new(report_collator_options).collate
+          ).collate
         end
 
         def handle_test_failure
@@ -125,7 +109,7 @@ module TestCenter
           report_filepath = nil
           junit_results = {}
           unless additional_info.key?(:test_operation_failure)
-            report_filepath = File.join(output_directory, @reportnamer.junit_last_reportname)
+            report_filepath = File.absolute_path(File.join(@options[:output_directory], @reportnamer.junit_last_reportname))
   
             config = FastlaneCore::Configuration.create(
               Fastlane::Actions::TestsFromJunitAction.available_options,
@@ -139,23 +123,23 @@ module TestCenter
           info = {
             failed: junit_results[:failed],
             passing: junit_results[:passing],
-            batch: @options[:batch] || 1,
+            batch: 1,
             try_count: @testrun_count,
             report_filepath: report_filepath
           }.merge(additional_info)
 
           if @reportnamer.includes_html?
-            html_report_filepath = File.join(output_directory, @reportnamer.html_last_reportname)
+            html_report_filepath = File.join(@options[:output_directory], @reportnamer.html_last_reportname)
             info[:html_report_filepath] = html_report_filepath
           end
           if @reportnamer.includes_json?
-            json_report_filepath = File.join(output_directory, @reportnamer.json_last_reportname)
+            json_report_filepath = File.join(@options[: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(output_directory, @options[:scheme]) + test_result_suffix
+            test_result_bundlepath = File.join(@options[:output_directory], @options[:scheme]) + test_result_suffix
             info[:test_result_bundlepath] = test_result_bundlepath
           end
           @options[:testrun_completed_block].call(info)
@@ -173,7 +157,7 @@ module TestCenter
         end
 
         def update_only_testing
-          report_filepath = File.join(output_directory, @reportnamer.junit_last_reportname)
+          report_filepath = File.join(@options[:output_directory], @reportnamer.junit_last_reportname)
           config = FastlaneCore::Configuration.create(
             Fastlane::Actions::TestsFromJunitAction.available_options,
             {
@@ -233,7 +217,8 @@ module TestCenter
         def move_test_result_bundle_for_next_run
           return unless @options[:result_bundle]
 
-          glob_pattern = "#{output_directory}/*.test_result"
+          absolute_output_directory = File.absolute_path(@options[:output_directory])
+          glob_pattern = "#{absolute_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

@@ -24,26 +24,22 @@ module TestCenter
           @given_output_files = multi_scan_options[:output_files]
           @parallelize = multi_scan_options[:parallelize]
           @test_collector = TestCenter::Helper::TestCollector.new(multi_scan_options)
-          if  ENV['USE_REFACTORED_PARALLELIZED_MULTI_SCAN']
-            @scan_options = multi_scan_options
-          else
-            @scan_options = multi_scan_options.reject do |option, _|
-              %i[
-                output_directory
-                only_testing
-                skip_testing
-                clean
-                try_count
-                batch_count
-                custom_report_file_name
-                fail_build
-                testrun_completed_block
-                output_types
-                output_files
-                parallelize
-                quit_simulators
-              ].include?(option)
-            end
+          @scan_options = multi_scan_options.reject do |option, _|
+            %i[
+              output_directory
+              only_testing
+              skip_testing
+              clean
+              try_count
+              batch_count
+              custom_report_file_name
+              fail_build
+              testrun_completed_block
+              output_types
+              output_files
+              parallelize
+              quit_simulators
+            ].include?(option)
           end
           @scan_options[:clean] = false
           @scan_options[:disable_concurrent_testing] = true
@@ -58,10 +54,56 @@ 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']
-              run_test_batch_through_retrying_scan(test_batch, current_batch_index)
+              # destination = @parallelizer&.destination_for_batch(current_batch_index) || Scan&.config&.fetch(:destination)
+              # if destination.nil?
+              #   app_infoplist ||= XCTestrunInfo.new(@scan_options[:xctestrun])
+                
+              #   batch_deploymentversions = @test_collector.test_batches.map do |test_batch|
+              #     testable = test_batch.first.split('/').first.gsub('\\', '')
+              #     # TODO: investigate the reason for this call that doesn't seem to do
+              #     # anything other than query for and then discard MinimumOSVersion
+              #     app_infoplist.app_plist_for_testable(testable)['MinimumOSVersion']
+              #   end
+
+              #   device_description = @scan_options[:device]
+              #   device_name = 'iPhone 5s'
+              #   device_version = batch_deploymentversions[current_batch_index]
+              #   unless device_description.nil?
+              #     /(?<device_name>.*)\s+\((?<device_version>.*)\)/ =~ device_description
+              #   end
+              #   # TODO: check for an existing simulator that can serve
+              #   all_runtimes = ::Snapshot::ResetSimulators.runtimes
+
+              #   all_ios_runtimes = all_runtimes.select { |v, id| v[/^iOS/] }
+              #   ios_runtimes_greater_than_equal = all_ios_runtimes.select do |versionstr, _|
+              #     _, version = versionstr.split(' ')
+              #     Gem::Version.new(device_version) <= Gem::Version.new(version)
+              #   end
+              #   ios_runtimes_greater_than_equal.sort! do |a, b|
+              #     version_a = a.first.split(' ').last
+              #     version_b = b.first.split(' ').last
+              #     Gem::Version.new(version_a) <=> Gem::Version.new(version_b)
+              #   end
+                
+              #   runtime = ios_runtimes_greater_than_equal.first.last
+              #   device_type = `xcrun simctl list devicetypes`.scan(/(.*)\s\((.*)\)/)
+              #     .find { |name, device_id| name == device_name }
+
+              #   command = "xcrun simctl create '#{device_name}' #{device_type.last} #{runtime}"
+              #   UI.command(command) if ::FastlaneCore::Globals.verbose?
+              #   udid = `#{command}`.chomp
+              #   destination = "platform=iOS Simulator,id=#{udid}"
+              # end
+              retrying_scan = TestCenter::Helper::MultiScanManager::RetryingScan.new(
+                @scan_options.merge(
+                  # destination: destination,
+                  only_testing: test_batch.map(&:shellsafe_testidentifier),
+                  output_directory: @output_directory
+                ).reject { |key| %i[device devices].include?(key) }
+              )
+              retrying_scan.run
             else
               output_directory = testrun_output_directory(@output_directory, test_batch, current_batch_index)
               reset_for_new_testable(output_directory)
@@ -88,45 +130,9 @@ 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.3"
+    VERSION = "3.6.3.parallelizing-alpha-1"
   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.3
+  version: 3.6.3.parallelizing.pre.alpha.pre.1
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json