fastlane-plugin-test_center 3.8.0.parallelizing.beta.2 → 3.8.0.parallelizing.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3369bb517e8397178591e8751835171fbe63b10a
-  data.tar.gz: 0e76683cdb19d3d7f860b075036bc317e0ef3d8d
+  metadata.gz: 13ad7e271c23c0d85c4c1afa01f3e501d14b7b9a
+  data.tar.gz: d82d02aadd52a0222c01943597995878f66f65a5
 SHA512:
-  metadata.gz: b96e7270ffaf8e14d4a947441ce75467cd788df5c4dda187d452863633d2506c8fce51e33e61b7d6f3064d6d8141336e708a5e27b6ff2dd966a68e6d725aa24e
-  data.tar.gz: 6c08aa5b1da5bdfa7352ecbd64a28407da4f978c2afa338cb8f7f953056ff7f723ed9ef2e887e2003b99fad1eae2e59a5ce8cfbbd267364e0b27679a4ba37073
+  metadata.gz: 50b4a4721bdfe01fa4b117c55d297666fe6b2b1d1e8fe5c7ea1c21b18ca99442d11d20aef1ce80480c20f80eda6b177b0b9ea0e1fc325644638bba0ab8a1a532
+  data.tar.gz: 635cf64125c954ac153940fb5b335ec4f357e12dc3392e2452b221c33d9cbe3e9f3d3f0efbe8742509ba067dce5f9f14eec44c920eee10baa8c19446bf6d5712

data/README.md

@@ -97,6 +97,10 @@ Rather than wasting time trying to account for unstable tools, or trying to twea
 
 Another issue that can cause tests to incorrectly fail comes from an issue with the iOS Simulator. If you provide a huge number of tests to the iOS Simulator, it can exhaust the available resources and cause it to fail large numbers of tests. You can get around this by running your tests in batches using the `:batch_count` option in order to lighten the load on the simulator.
 
+#### Reduce Test Run Time
+
+Make better use of your Mac resources by running batches of test runs in parallel iOS Simulators running simultaneously. Use the `:parallel_testrun_count` option to specify 2 to 6 simulators, each running a subset of your tests. It is not recommended to run more than 6 simulators in parallel as the service that backs the simulators can fail to connect to them.
+
 #### Inspect Partial Results
 
 If you have a large number of tests, and you want to inspect the overall status of how test runs are progressing, you can use the `:testrun_completed_block` callback to bailout early or make adjustments on how your tests are exercised.

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

@@ -18,6 +18,8 @@ module Fastlane
           )
         end
         # :nocov:
+        params[:quit_simulators] ||= params._values[:force_quit_simulator]
+
         force_quit_simulator_processes if params[:quit_simulators]
 
         prepare_for_testing(params.values)
@@ -110,31 +112,46 @@ module Fastlane
       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| %i[project workspace scheme device devices].include?(k) }
-
-          Scan.config = FastlaneCore::Configuration.create(
-            Fastlane::Actions::ScanAction.available_options,
-            scan_options.merge(build_for_testing: true)
+        values = prepare_scan_options_for_build_for_testing(scan_options)
+        # :nocov:
+        unless Helper.test?
+          FastlaneCore::PrintTable.print_values(
+            config: values,
+            hide_keys: [:destination, :slack_url],
+            title: "Summary for scan #{Fastlane::VERSION}"
           )
-          values = Scan.config.values(ask: false)
-          values[:xcode_path] = File.expand_path("../..", FastlaneCore::Helper.xcode_path)
-          
-          # :nocov:
-          unless Helper.test?
-            FastlaneCore::PrintTable.print_values(
-              config: values,
-              hide_keys: [:destination, :slack_url],
-              title: "Summary for scan #{Fastlane::VERSION}"
-            )
-          end
-          # :nocov:
+        end
+        # :nocov:
 
-          Scan::Runner.new.run
-          remove_build_report_files
+        remove_preexisting_xctestrun_files
+        Scan::Runner.new.run
+        update_xctestrun_after_build(scan_options)
+        remove_build_report_files
+
+        Scan.config._values.delete(:build_for_testing)
+        scan_options[:derived_data_path] = Scan.config[:derived_data_path]
+      end
+
+      def self.prepare_scan_options_for_build_for_testing(scan_options)
+        valid_scan_keys = Fastlane::Actions::ScanAction.available_options.map(&:key)
+        scan_options = scan_options.select { |k,v| %i[project workspace scheme device devices].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)
+        values
+      end
+
+      def self.update_xctestrun_after_build(scan_options)
+        scan_options[:xctestrun] = Dir.glob("#{Scan.config[:derived_data_path]}/Build/Products/*.xctestrun").first
+      end
 
-          Scan.config._values.delete(:build_for_testing)
-          scan_options[:derived_data_path] = Scan.config[:derived_data_path]
+      def self.remove_preexisting_xctestrun_files
+        xctestrun_files = Dir.glob("#{Scan.config[:derived_data_path]}/Build/Products/*.xctestrun")
+        FileUtils.rm_rf(xctestrun_files)
       end
 
       def self.remove_build_report_files
@@ -182,7 +199,7 @@ module Fastlane
       end
 
       def self.scan_options
-        ScanAction.available_options.reject { |config| %i[output_types force_quit_simulator].include?(config.key) }
+        ScanAction.available_options.reject { |config| %i[output_types].include?(config.key) }
       end
 
       def self.available_options

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

@@ -36,12 +36,12 @@ module TestCenter
           @options[:only_testing] = @options[:only_testing]&.map(&:strip_testcase)&.uniq
           @options[:skip_testing] = @options[:skip_testing]&.map(&:strip_testcase)&.uniq
           
-          RetryingScan.run(@options.reject { |key| %i[device devices].include?(key) } )
+          RetryingScan.run(@options.reject { |key| %i[device devices force_quit_simulator].include?(key) } )
         end
         
         def run_test_batches
           test_batch_results = []
-          pool_options = @options.reject { |key| %i[device devices].include?(key) }
+          pool_options = @options.reject { |key| %i[device devices force_quit_simulator].include?(key) }
           pool_options[:test_batch_results] = test_batch_results
 
           pool = TestBatchWorkerPool.new(pool_options)

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

@@ -29,7 +29,9 @@ module TestCenter
       end
 
       def derived_testrun_path(derived_data_path, scheme)
-        Dir.glob("#{derived_data_path}/Build/Products/#{scheme}*.xctestrun").first
+        xctestrun_files = Dir.glob("#{derived_data_path}/Build/Products/*.xctestrun")
+        xctestrun_files.sort { |f1, f2| File.mtime(f1) <=> File.mtime(f2) }
+          .last
       end
 
       def testables

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.8.0.parallelizing.beta.2"
+    VERSION = "3.8.0.parallelizing.beta.3"
   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.2
+  version: 3.8.0.parallelizing.beta.3
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json