fastlane-plugin-test_center 3.7.0 → 3.8.0.parallelizing.beta.1

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

@@ -0,0 +1,133 @@
+module TestCenter
+  module Helper
+    module MultiScanManager
+      class TestBatchWorkerPool
+        def initialize(options)
+          @options = options
+        end
+
+        def is_serial?
+          @options.fetch(:parallel_testrun_count, 1) == 1
+        end
+
+        def setup_workers
+          if is_serial?
+            setup_serial_workers
+          else
+            setup_parallel_workers
+          end
+        end
+
+        def setup_cloned_simulators
+          return [] unless @options[:platform] == :ios
+
+          @simhelper = SimulatorHelper.new(
+            parallel_testrun_count: @options[:parallel_testrun_count]
+          )
+          @simhelper.setup
+          @clones = @simhelper.clone_destination_simulators
+          main_pid = Process.pid
+          at_exit do
+            clean_up_cloned_simulators(@clones) if Process.pid == main_pid
+          end
+          @clones
+        end
+
+        def destination_for_worker(worker_index)
+          return @options[:destination] unless @options[:platform] == :ios
+
+          @clones[worker_index].map do |simulator|
+            "platform=iOS Simulator,id=#{simulator.udid}"
+          end
+        end
+
+        def setup_parallel_workers
+          setup_cloned_simulators
+          desired_worker_count = @options[:parallel_testrun_count]
+          @workers = []
+          (0...desired_worker_count).each do |worker_index|
+            @workers << ParallelTestBatchWorker.new(parallel_scan_options(worker_index))
+          end
+        end
+
+        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
+          options[:test_batch_results] = @options[:test_batch_results]
+          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"
+        end
+
+        def derived_data_path_for_worker(worker_index)
+          Dir.mktmpdir(['derived_data_path', "-worker-#{worker_index.to_s}"])
+        end
+
+        def clean_up_cloned_simulators(clones)
+          return if clones.nil?
+
+          clones.flatten.each(&:delete)
+        end
+
+        def setup_serial_workers
+          serial_scan_options = @options.reject { |key| %i[device devices].include?(key) }
+          serial_scan_options[:destination] ||= Scan&.config&.fetch(:destination)
+          @workers = [
+            TestBatchWorker.new(serial_scan_options)
+          ]
+        end
+
+        def wait_for_worker
+          if is_serial?
+            return @workers[0]
+          else
+            if_no_available_workers = Proc.new do
+              worker = nil
+              loop do
+                freed_child_proc_pid = Process.wait
+                worker = @workers.find do |w|
+                  w.pid == freed_child_proc_pid
+                end
+
+                break if worker
+              end
+              worker.process_results
+              worker
+            end
+
+            first_ready_to_work_worker = @workers.find(if_no_available_workers) do |worker|
+              worker.state == :ready_to_work
+            end
+          end
+        end
+
+        def wait_for_all_workers
+          unless is_serial?
+            busy_workers = @workers.each.select { |w| w.state == :working }
+            busy_workers.map(&:pid).each do |pid|
+              Process.wait(pid)
+            end
+            busy_workers.each { |w| w.process_results }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+require_relative 'multi_scan_manager/report_collator'
+require_relative 'multi_scan_manager/runner'
+require_relative 'xctestrun_info'

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

@@ -64,9 +64,12 @@ module TestCenter
         numbered_filename(@output_files.to_s.split(',')[junit_index])
       end
 
-      def junit_reportname
+      def junit_reportname(suffix = '')
         junit_index = @output_types.split(',').find_index('junit')
-        @output_files.to_s.split(',')[junit_index]
+        report_name = @output_files.to_s.split(',')[junit_index]
+        return report_name if suffix.empty?
+
+        "#{File.basename(report_name, '.*')}-#{suffix}#{junit_filextension}"
       end
 
       def junit_filextension
@@ -90,9 +93,12 @@ module TestCenter
         numbered_filename(@output_files.to_s.split(',')[html_index])
       end
 
-      def html_reportname
+      def html_reportname(suffix = '')
         html_index = @output_types.split(',').find_index('html')
-        @output_files.to_s.split(',')[html_index]
+        report_name = @output_files.to_s.split(',')[html_index]
+        return report_name if suffix.empty?
+
+        "#{File.basename(report_name, '.*')}-#{suffix}#{html_filextension}"
       end
 
       def html_filextension
@@ -116,9 +122,12 @@ module TestCenter
         numbered_filename(@output_files.to_s.split(',')[json_index])
       end
 
-      def json_reportname
+      def json_reportname(suffix = '')
         json_index = @output_types.split(',').find_index('json')
-        @output_files.to_s.split(',')[json_index]
+        report_name = @output_files.to_s.split(',')[json_index]
+        return report_name if suffix.empty?
+
+        "#{File.basename(report_name, '.*')}-#{suffix}#{json_filextension}"
       end
 
       def json_filextension

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

@@ -5,6 +5,8 @@ module TestCenter
     require 'plist'
 
     class TestCollector
+      attr_reader :xctestrun_path
+
       def initialize(options)
         unless options[:xctestrun] || options[:derived_data_path]
           options[:derived_data_path] = default_derived_data_path(options)
@@ -15,13 +17,13 @@ module TestCenter
         end
         @only_testing = options[:only_testing]
         @skip_testing = options[:skip_testing]
-        @invocation_based_tests = options[:invocation_based_tests]
+        @batch_count = options[:batch_count]
+        if @batch_count == 1 && options[:parallel_testrun_count] > 1
+          @batch_count = options[:parallel_testrun_count]
+        end
       end
 
       def default_derived_data_path(options)
-        Scan.project = FastlaneCore::Project.new(
-          options.select { |k, v| %i[workspace project].include?(k) }
-        )
         project_derived_data_path = Scan.project.build_settings(key: "BUILT_PRODUCTS_DIR")
         File.expand_path("../../..", project_derived_data_path)
       end
@@ -35,8 +37,8 @@ module TestCenter
           if @only_testing
             @testables ||= only_testing_to_testables_tests.keys
           else
-            @testables ||= Plist.parse_xml(@xctestrun_path).keys.reject do |retrievedTestable| 
-              Fastlane::Actions::TestsFromXctestrunAction.ignoredTestables.include?(retrievedTestable)
+            @testables ||= Plist.parse_xml(@xctestrun_path).keys.reject do |key|
+              key == '__xctestrun_metadata__'
             end
           end
         end
@@ -52,19 +54,36 @@ module TestCenter
         tests
       end
 
+      def xctestrun_known_tests
+        config = FastlaneCore::Configuration.create(
+          ::Fastlane::Actions::TestsFromXctestrunAction.available_options,
+          {
+            xctestrun: @xctestrun_path,
+            invocation_based_tests: @invocation_based_tests
+          }
+        )
+        ::Fastlane::Actions::TestsFromXctestrunAction.run(config)
+      end
+
       def testables_tests
         unless @testables_tests
           if @only_testing
+            known_tests = nil
             @testables_tests = only_testing_to_testables_tests
+            
+            @testables_tests.each do |testable, tests|
+              tests.each_with_index do |test, index|
+                if test.count('/') < 2
+                  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) } 
+                end
+              end
+              @testables_tests[testable].flatten!
+            end
           else
-            config = FastlaneCore::Configuration.create(
-              ::Fastlane::Actions::TestsFromXctestrunAction.available_options,
-              {
-                xctestrun: @xctestrun_path,
-                invocation_based_tests: @invocation_based_tests
-              }
-            )
-            @testables_tests = ::Fastlane::Actions::TestsFromXctestrunAction.run(config)
+            @testables_tests = xctestrun_known_tests
             if @skip_testing
               skipped_testable_tests = Hash.new { |h, k| h[k] = [] }
               @skip_testing.sort.each do |skipped_test_identifier|
@@ -77,8 +96,30 @@ module TestCenter
             end
           end
         end
+        
         @testables_tests
       end
+
+      def test_batches
+        if @batches.nil?
+          @batches = []
+          testables.each do |testable|
+            testable_tests = testables_tests[testable]
+            next if testable_tests.empty?
+
+            if @batch_count > 1
+              slice_count = [(testable_tests.length / @batch_count.to_f).ceil, 1].max
+              testable_tests.each_slice(slice_count).to_a.each do |tests_batch|
+                @batches << tests_batch
+              end
+            else
+              @batches << testable_tests
+            end
+          end
+        end
+
+        @batches
+      end
     end
   end
 end

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

@@ -0,0 +1,42 @@
+module TestCenter
+  module Helper
+    require 'plist'
+
+    class XCTestrunInfo
+      def initialize(xctestrun_filepath)
+        raise Errno::ENOENT, xctestrun_filepath unless File.exist?(xctestrun_filepath)
+
+        @xctestrun = Plist.parse_xml(xctestrun_filepath)
+        @xctestrun_rootpath = File.dirname(xctestrun_filepath)
+      end
+
+      def app_path_for_testable(testable)
+        @xctestrun[testable].fetch('UITargetAppPath') do |_|
+          @xctestrun[testable]['TestHostPath']
+        end.sub('__TESTROOT__', @xctestrun_rootpath)
+      end
+
+      def app_plist_for_testable(testable)
+        binary_plistfile = File.join(app_path_for_testable(testable), 'Info.plist')
+
+        Plist.parse_binary_xml(binary_plistfile)
+      end
+    end
+  end
+end
+
+require 'plist'
+
+class Hash
+  def save_binary_plist(filename, options = {})
+    Plist::Emit.save_plist(self, filename)
+    `plutil -convert binary1 \"#{filename}\"`
+  end
+end
+
+module Plist
+  def self.parse_binary_xml(filename)
+    `plutil -convert xml1 \"#{filename}\"`
+    Plist.parse_xml(filename)
+  end
+end

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

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

data/lib/fastlane/plugin/test_center.rb

@@ -4,7 +4,7 @@ module Fastlane
   module TestCenter
     # Return all .rb files inside the "actions" and "helper" directory
     def self.all_classes
-      Dir[File.expand_path('**/{actions,helper}/*.rb', File.dirname(__FILE__))]
+      Dir[File.expand_path('**/{actions,helper}/**/*.rb', File.dirname(__FILE__))]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0.parallelizing.beta.1
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -67,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.7
 - !ruby/object:Gem::Dependency
-  name: cocoapods
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.56.0
+        version: 2.108.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.56.0
+        version: 2.108.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -249,16 +249,27 @@ files:
 - lib/fastlane/plugin/test_center/actions/collate_junit_reports.rb
 - lib/fastlane/plugin/test_center/actions/collate_test_result_bundles.rb
 - lib/fastlane/plugin/test_center/actions/multi_scan.rb
+- lib/fastlane/plugin/test_center/actions/quit_core_simulator_service.rb
 - lib/fastlane/plugin/test_center/actions/suppress_tests.rb
 - lib/fastlane/plugin/test_center/actions/suppress_tests_from_junit.rb
 - lib/fastlane/plugin/test_center/actions/suppressed_tests.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_junit.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_xctestrun.rb
-- lib/fastlane/plugin/test_center/helper/correcting_scan_helper.rb
 - lib/fastlane/plugin/test_center/helper/junit_helper.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/device_manager.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/parallel_test_batch_worker.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/report_collator.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/retrying_scan.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/retrying_scan_helper.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/runner.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/simulator_helper.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/test_batch_worker.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/test_batch_worker_pool.rb
 - lib/fastlane/plugin/test_center/helper/reportname_helper.rb
 - lib/fastlane/plugin/test_center/helper/test_collector.rb
 - lib/fastlane/plugin/test_center/helper/xcodebuild_string.rb
+- lib/fastlane/plugin/test_center/helper/xctestrun_info.rb
 - lib/fastlane/plugin/test_center/version.rb
 homepage: https://github.com/lyndsey-ferguson/fastlane-plugin-test_center
 licenses:
@@ -275,9 +286,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: []
 rubyforge_project: 
 rubygems_version: 2.6.11