fastlane-plugin-test_center 3.8.0.parallelizing.beta.6 → 3.8.0.parallelizing.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0abb88b056ab3ce1b5134bcba455b75b03edba6
-  data.tar.gz: a46757467fd8252aeee2b5e2d8d8c56951c66c3c
+  metadata.gz: 7d7647dee8a9311b8e18eeba2a4afbc906d0c751
+  data.tar.gz: 0074ac993896e002df67534365fe1e367a2bc71d
 SHA512:
-  metadata.gz: 8e3831bd80e00306f11182cbc869fe90cac17ed4f74b9866d69481d19bf629be28e1fe62fce1001cfc81c056a79c18c3aa12ccbd1b4ccd9828f6f9eb1aff3f11
-  data.tar.gz: 67ac125bf98de3c843a627817f792a09b6620641a385e4b4c29d9843f281a4c9c7469ab772ed11a253c16fc444a8fb031031be25023e30652cc0e781387b0ae3
+  metadata.gz: 2da85b784f6d88a4b0022c07ec3d6b2def13c1a7f47d8634ae1a665255d814de59c783ff85d39765fdc523cba1bb260200c01f314d25cff846cd946747425f7c
+  data.tar.gz: 8fdec1723d3d712a5907c240a0121997553b3aa5750cd2eb856721d7b09e7a2f14d7358f41eb730522993508fa190e37d05e1ac34cb60249292d9eb0a853c0e4

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

@@ -49,7 +49,11 @@ module TestCenter
         end
 
         def print_starting_scan_message
-          scan_message = "Starting scan ##{@testrun_count + 1} with #{@options.fetch(:only_testing, []).size} tests"
+          if @options[:only_testing]
+            scan_message = "Starting scan ##{@testrun_count + 1} with #{@options.fetch(:only_testing, []).size} tests"
+          else
+            scan_message = "Starting scan ##{@testrun_count + 1}"
+          end
           scan_message << " for batch ##{@options[:batch]}" unless @options[:batch].nil?
           FastlaneCore::UI.message("#{scan_message}.")
         end
@@ -117,7 +121,6 @@ module TestCenter
 
         def handle_test_failure
           send_callback_testrun_info
-          reset_simulators
           move_test_result_bundle_for_next_run
           update_scan_options
           @reportnamer.increment
@@ -189,12 +192,6 @@ module TestCenter
             @options[:only_testing] = @options[:only_testing].map(&:strip_testcase).uniq
           end
         end
-        
-        def reset_simulators
-          return unless @options[:reset_simulators]
-
-          @options[:simulators].each(&:reset)
-        end
 
         def handle_build_failure(exception)
           test_operation_failure = ''
@@ -219,11 +216,6 @@ module TestCenter
             send_callback_testrun_info(test_operation_failure: test_operation_failure)
             raise exception
           end
-          if @options[:reset_simulators]
-            @options[:simulators].each do |simulator|
-              simulator.reset
-            end
-          end
           send_callback_testrun_info(test_operation_failure: test_operation_failure)
         end
 

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

@@ -12,11 +12,19 @@ module TestCenter
         attr_reader :retry_total_count
 
         def initialize(multi_scan_options)
-          @test_collector = TestCenter::Helper::TestCollector.new(multi_scan_options)
           @options = multi_scan_options.merge(
             clean: false,
             disable_concurrent_testing: true
           )
+          @batch_count = 1 # default count. Will be updated by setup_testcollector
+          setup_testcollector
+        end
+
+        def setup_testcollector
+          return if @options[:invocation_based_tests] && @options[:only_testing].nil?
+          return if @test_collector
+
+          @test_collector = TestCenter::Helper::TestCollector.new(@options)
           @batch_count = @test_collector.test_batches.size
         end
 
@@ -34,9 +42,13 @@ module TestCenter
         def run
           remove_preexisting_test_result_bundles
 
-          if @options[:invocation_based_tests]
-            run_invocation_based_tests
-          else
+          tests_passed = false
+          if @options[:invocation_based_tests] && @options[:only_testing].nil?
+            tests_passed = run_invocation_based_tests
+          end
+
+          unless tests_passed || @options[:try_count] < 1
+            setup_testcollector  
             run_test_batches
           end
         end
@@ -50,11 +62,32 @@ module TestCenter
         end
 
         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) } )
+          @options[:destination] = Scan.config[:destination]
+          
+          options = @options.reject { |key| %i[device devices force_quit_simulator].include?(key) }
+          options[:try_count] = 1
+  
+          tests_passed = RetryingScan.run(options)
+          @options[:try_count] -= 1
+          
+          reportnamer = ReportNameHelper.new(
+            @options[:output_types],
+            @options[:output_files],
+            @options[:custom_report_file_name]
+          )
+          report_filepath = File.join(output_directory, reportnamer.junit_last_reportname)
+          config = FastlaneCore::Configuration.create(
+            Fastlane::Actions::TestsFromJunitAction.available_options,
+            {
+              junit: File.absolute_path(report_filepath)
+            }
+          )
+          @options[:only_testing] = Fastlane::Actions::TestsFromJunitAction.run(config)[:failed]
+          @options[:only_testing] = @options[:only_testing].map(&:strip_testcase).uniq
+          
+          tests_passed
         end
         
         def run_test_batches

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

@@ -17,6 +17,7 @@ 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]
@@ -67,23 +68,28 @@ module TestCenter
         ::Fastlane::Actions::TestsFromXctestrunAction.run(config)
       end
 
+      def expand_testsuites_to_tests
+        return if @invocation_based_tests
+
+        known_tests = nil
+        @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
+      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
+            expand_testsuites_to_tests
           else
             @testables_tests = xctestrun_known_tests
             if @skip_testing

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

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