fastlane-plugin-test_center 3.8.0.parallelizing.beta.4 → 3.8.0.parallelizing.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a648ab034eb7f0efa4c6ecfc009e91ad1edb2d46
-  data.tar.gz: 55d4baedfb98e17e9f43052d9473257d65194529
+  metadata.gz: 9009b24fcae4a31fad31d0cd1bccf91e8579f125
+  data.tar.gz: cbb3dc2c2059adcab3e0a14c7b36abfab2e6b8cd
 SHA512:
-  metadata.gz: 5e81661e1d9fbf1b4324365fc3f2bad744d1a463dd647aeb79c9515a0266ccf8a0fe76d5f9be96681114b8136ff7f7293043df50e165d1bf7c30d3c4bed1b5da
-  data.tar.gz: 8515c5e5326ce48910f6f6ab59d0517469054f4d8efaebaf7fd336b8a44a4a563b8aef287162dd4b71e89777d21a13392cee94433b40cb5721ef85c369aa7aa9
+  metadata.gz: f4058a6ddf791d5746cc302eccbb4efe5819d26d4199ba98a18b227dd1efa583b5285cd63a8321ec971f45f8dd3b7614d10c5a31a7e88cd1210b75903e010fac
+  data.tar.gz: 9e939e96beafc7d9f57d0975e21efadf58e16f0549d0cc6a607694f7f77002791313703f8836bd437c1d30fb5ded3b372f2bef5b6f7dfaba7a85ab006cbf4374

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

@@ -161,7 +161,7 @@ module Fastlane
 
       # :nocov:
       def self.description
-        "Combines and combines tests from multiple html report files"
+        "Combines multiple html report files into one html report file"
       end
 
       def self.details

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

@@ -100,7 +100,7 @@ module Fastlane
 
       # :nocov:
       def self.description
-        "Combines and combines tests from multiple json report files"
+        "Combines multiple json report files into one json report file"
       end
 
       def self.details

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

@@ -149,7 +149,7 @@ module Fastlane
       #####################################################
       # :nocov:
       def self.description
-        "Combines and combines tests from multiple junit report files"
+        "Combines multiple junit report files into one junit report file"
       end
 
       def self.details

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

@@ -113,7 +113,7 @@ module Fastlane
 
       # :nocov:
       def self.description
-        "Combines and combines tests from multiple test_result bundles"
+        "Combines multiple test_result bundles into one test_result bundle"
       end
 
       def self.details

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

@@ -175,8 +175,7 @@ module Fastlane
 
       # :nocov:
       def self.description
-        "Uses scan to run Xcode tests a given number of times, with the option " \
-        "of batching them, only re-testing failing tests."
+        "Uses scan to run Xcode tests a given number of times, with the option of batching and/or parallelizing them, only re-testing failing tests."
       end
 
       def self.details

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

@@ -17,7 +17,7 @@ module TestCenter
         def process_results
           @pid = nil
           File.foreach(@log_filepath) do |line|
-            puts "[worker #{@options[:batch_index]}] #{line}"
+            puts "[worker #{@options[:batch_index] + 1}] #{line}"
           end
           state = :ready_to_work
           @options[:test_batch_results] << (@reader.gets == 'true')
@@ -32,6 +32,9 @@ module TestCenter
             begin
               reroute_stdout_to_logfile
               tests_passed = super(run_options)
+            rescue StandardError => e
+              puts e.message
+              puts e.backtrace.inspect
             ensure
               handle_child_process_results(tests_passed)
               exit!
@@ -44,7 +47,7 @@ module TestCenter
           @reader, @writer = IO.pipe
           @log_filepath = File.join(
             Dir.mktmpdir,
-            "parallel-test-batch-#{@options[:batch_index]}.txt"
+            "parallel-test-batch-#{@options[:batch_index] + 1}.txt"
           )
         end
 

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

@@ -45,12 +45,7 @@ module TestCenter
         end
 
         def output_directory
-          absolute_output_directory = File.absolute_path(@options[:output_directory])
-          if @options[:batch]
-            testable = @options.fetch(:only_testing, ['']).first.split('/').first || ''
-            absolute_output_directory = File.join(absolute_output_directory, "#{testable}-batch-#{@options[:batch]}")
-          end
-          absolute_output_directory
+          @options.fetch(:output_directory, 'test_results')
         end
 
         def print_starting_scan_message
@@ -220,7 +215,7 @@ module TestCenter
               Fastlane::Actions::RestartCoreSimulatorServiceAction.run
             end
           else
-            FastlaneCore::UI.error(test_operation_failure)
+            FastlaneCore::UI.error(test_session_last_messages)
             send_callback_testrun_info(test_operation_failure: test_operation_failure)
             raise exception
           end

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

@@ -20,8 +20,15 @@ module TestCenter
           @batch_count = @test_collector.test_batches.size
         end
 
-        def output_directory
-          @options.fetch(:output_directory, 'test_results')
+        def output_directory(batch_index = 0, test_batch = [])
+          undecorated_output_directory = File.absolute_path(@options.fetch(:output_directory, 'test_results'))
+
+          return undecorated_output_directory if batch_index.zero?
+
+          absolute_output_directory = undecorated_output_directory
+
+          testable = test_batch.first.split('/').first || ''
+          File.join(absolute_output_directory, "#{testable}-batch-#{batch_index}")
         end
 
         def run
@@ -45,7 +52,8 @@ module TestCenter
         def run_invocation_based_tests
           @options[:only_testing] = @options[:only_testing]&.map(&:strip_testcase)&.uniq
           @options[:skip_testing] = @options[:skip_testing]&.map(&:strip_testcase)&.uniq
-          
+          @options[:output_directory] = output_directory
+
           RetryingScan.run(@options.reject { |key| %i[device devices force_quit_simulator].include?(key) } )
         end
         
@@ -53,6 +61,7 @@ module TestCenter
           test_batch_results = []
           pool_options = @options.reject { |key| %i[device devices force_quit_simulator].include?(key) }
           pool_options[:test_batch_results] = test_batch_results
+          pool_options[:xctestrun] = @test_collector.xctestrun_path
 
           pool = TestBatchWorkerPool.new(pool_options)
           pool.setup_workers
@@ -60,7 +69,7 @@ module TestCenter
           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              
-            FastlaneCore::UI.message("Starting test run #{current_batch_index}")
+            FastlaneCore::UI.message("Starting test run #{current_batch_index + 1}")
             worker.run(scan_options_for_worker(test_batch, current_batch_index))
           end
           pool.wait_for_all_workers
@@ -71,10 +80,9 @@ module TestCenter
         def scan_options_for_worker(test_batch, batch_index)
           {
             only_testing: test_batch.map(&:shellsafe_testidentifier),
-            output_directory: output_directory,
+            output_directory: output_directory(batch_index + 1, test_batch),
             try_count: @options[:try_count],
-            batch: batch_index + 1,
-            xctestrun: @test_collector.xctestrun_path
+            batch: batch_index + 1
           }
         end
   
@@ -82,10 +90,21 @@ module TestCenter
           return unless @batch_count > 1
           return unless @options[:collate_reports]
 
-
           @test_collector.testables.each do |testable|
             collate_batched_reports_for_testable(testable)
           end
+          move_single_testable_reports_to_final_location
+        end
+
+        def move_single_testable_reports_to_final_location
+          return unless @test_collector.testables.size == 1
+
+          report_files_dir = File.join(
+            File.absolute_path(output_directory),
+            @test_collector.testables.first
+          )
+          FileUtils.cp_r("#{report_files_dir}/.", File.absolute_path(output_directory))
+          FileUtils.rm_rf(report_files_dir)
         end
 
         def collate_batched_reports_for_testable(testable)

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

@@ -28,7 +28,7 @@ module TestCenter
             original_simulators.each do |simulator|
               FastlaneCore::UI.verbose("Cloning simulator")
               cloned_simulator = simulator.clone
-              new_first_name = simulator.name.sub(/( ?\(.*| ?$)/, " Clone #{batch_index}")
+              new_first_name = simulator.name.sub(/( ?\(.*| ?$)/, " Clone #{batch_index + 1}")
               new_last_name = "#{self.class.name}<#{self.object_id}>"
               cloned_simulator.rename("#{new_first_name} #{new_last_name}")
 

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

@@ -34,6 +34,7 @@ module TestCenter
         end
 
         def destination_for_worker(worker_index)
+          # each worker has its own simulators to work with
           return @options[:destination] unless @options[:platform] == :ios
 
           @clones[worker_index].map do |simulator|
@@ -53,7 +54,6 @@ 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[:xctestrun] = xctestrun_products_clone if @options[:xctestrun]
           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
@@ -61,23 +61,16 @@ module TestCenter
           options
         end
 
-        def xctestrun_products_clone
-          xctestrun_filename = File.basename(@options[:xctestrun])
-          xcproduct_dirpath = File.dirname(@options[:xctestrun])
-          tmp_xcproduct_dirpath = Dir.mktmpdir
-          FileUtils.cp_r(xcproduct_dirpath, tmp_xcproduct_dirpath)
-          at_exit do
-            FileUtils.rm_rf(tmp_xcproduct_dirpath)
-          end
-          "#{tmp_xcproduct_dirpath}/#{File.basename(xcproduct_dirpath)}/#{xctestrun_filename}"
-        end
-
         def buildlog_path_for_worker(worker_index)
-          "#{@options[:buildlog_path]}/parallel-simulators-#{worker_index}-logs"
+          # ensure that simultaneous simulators are not writing to the same log
+          # at the same time.
+          "#{@options[:buildlog_path]}/worker-#{worker_index + 1}-logs"
         end
 
         def derived_data_path_for_worker(worker_index)
-          Dir.mktmpdir(['derived_data_path', "-worker-#{worker_index.to_s}"])
+          # ensure that simultaneous simulators are not writing diagnostics to
+          # the same location at the same time.
+          Dir.mktmpdir(['derived_data_path', "-worker-#{(worker_index + 1).to_s}"])
         end
 
         def clean_up_cloned_simulators(clones)

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.8.0.parallelizing.beta.4"
+    VERSION = "3.8.0.parallelizing.beta.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.8.0.parallelizing.beta.4
+  version: 3.8.0.parallelizing.beta.5
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json