fastlane-plugin-test_center 3.8.0.parallelizing.beta.8 → 3.8.0.parallelizing.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e73880166b9ba845963df59878b80eba77ca64d
-  data.tar.gz: 182b6aea7cbb03dfd121efc35dc832ca85a1bb6c
+  metadata.gz: f77fa973e751d52ce7fa63397e48ec3a2e9592d5
+  data.tar.gz: a0a0c9ea893833e04ddc526bc52bb7563d007d5d
 SHA512:
-  metadata.gz: 8d6998f5f5f3515b8aaf10c75a2b804e32e192088be2323ff442208034c01568c013122a8db9c602856fce420f66983eeaf3b32769b7ddcbbb522ffdbb758d86
-  data.tar.gz: cd1f2ff6cbe717c40564514dff042a747a082d5e82e33212cdab478c83899d788154f867d16f23964669e38a0e7231b9bc7cfee9e3c54b46ff7806fa75653cd4
+  metadata.gz: c1c924695fbd1e9f3f531266171c584c10012d7b5b4979b89383ad02b7ed3d19a7dc2f0e5a6e9cff7572d11608d2a56dcbb0879ce6b0f89ebdc68e7c8c5ff0d0
+  data.tar.gz: 5bfb8bbceee4dd66010437d77292f612efa78a2d2529edccb805faeff4ec4b5c72a12354d0349ad45ee31ab23f645329fb49ececa1bc298f713ea88069dbbdbc

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

@@ -21,13 +21,10 @@ module Fastlane
         runner_options = params.values.merge(platform: platform)
         runner = ::TestCenter::Helper::MultiScanManager::Runner.new(runner_options)
         tests_passed = runner.run
-        if params[:fail_build] && !tests_passed
-          raise UI.test_failure!('Tests have failed')
-        end
 
         summary = run_summary(params, tests_passed, runner.retry_total_count)
         print_run_summary(summary)
-
+        
         if params[:fail_build] && !tests_passed
           raise UI.test_failure!('Tests have failed')
         end
@@ -103,6 +100,9 @@ module Fastlane
       end
 
       def self.prepare_for_testing(scan_options)
+        reset_scan_config_to_defaults
+        use_scanfile_to_override_settings(scan_options)
+        ScanHelper.remove_preexisting_simulator_logs(scan_options)
         if scan_options[:test_without_building] || scan_options[:skip_build]
           UI.verbose("Preparing Scan config options for multi_scan testing")
           prepare_scan_config(scan_options)
@@ -112,10 +112,34 @@ module Fastlane
         end
       end
 
+      def self.reset_scan_config_to_defaults
+        return unless Scan.config
+
+        defaults = Hash[Fastlane::Actions::ScanAction.available_options.map { |i| [i.key, i.default_value] }]
+        FastlaneCore::UI.verbose("MultiScanAction resetting Scan config to defaults")
+        
+        Scan.config._values.each do |k,v|
+          Scan.config.set(k, defaults[k]) if defaults.key?(k)
+        end
+      end
+
+      def self.use_scanfile_to_override_settings(scan_options)
+        overridden_options = ScanHelper.options_from_configuration_file(
+          ScanHelper.scan_options_from_multi_scan_options(scan_options)
+        )
+        
+        unless overridden_options.empty?
+          FastlaneCore::UI.important("Scanfile found: overriding multi_scan options with it's values.")
+          overridden_options.each do |k,v|
+            scan_options[k] = v
+          end
+        end
+      end
+
       def self.prepare_scan_config(scan_options)
         Scan.config ||= FastlaneCore::Configuration.create(
           Fastlane::Actions::ScanAction.available_options,
-          scan_options.select { |k,v| %i[project workspace scheme device devices].include?(k) }
+          ScanHelper.scan_options_from_multi_scan_options(scan_options)
         )
       end
 
@@ -133,12 +157,9 @@ module Fastlane
       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)
+          ScanHelper.scan_options_from_multi_scan_options(scan_options.merge(build_for_testing: true))
         )
         values = Scan.config.values(ask: false)
         values[:xcode_path] = File.expand_path("../..", FastlaneCore::Helper.xcode_path)

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

@@ -18,10 +18,12 @@ module Fastlane
           xctest_path = xctest_bundle_path(xctestrun_rootpath, xctestrun_config)
           test_identifiers = XCTestList.tests(xctest_path)
           UI.verbose("Found the following tests: #{test_identifiers.join("\n\t")}")
+
           if xctestrun_config.key?('SkipTestIdentifiers')
-            skipped_tests = xctestrun_config['SkipTestIdentifiers']
-            UI.verbose("Removing skipped tests: #{skipped_tests.join("\n\t")}")
-            test_identifiers.reject! { |test_identifier| skipped_tests.include?(test_identifier) }
+            test_identifiers = subtract_skipped_tests_from_test_identifiers(
+              test_identifiers,
+              xctestrun_config['SkipTestIdentifiers']
+            )
           end
           if test_identifiers.empty? && !invocation_based_tests
             UI.error("No tests found in '#{xctest_path}'!")
@@ -34,6 +36,27 @@ module Fastlane
         tests
       end
 
+      def self.subtract_skipped_tests_from_test_identifiers(test_identifiers, skipped_test_identifiers)
+        skipped_tests_identifiers = []
+        skipped_testsuites = []
+        skipped_test_identifiers.each do |skipped_test|
+          if skipped_test.split('/').size > 1
+            skipped_tests_identifiers << skipped_test
+          else
+            skipped_testsuites << skipped_test
+          end
+        end
+        skipped_testsuites.each do |skipped_testsuite|
+          derived_skipped_tests = test_identifiers.select do |test_identifier|
+            test_identifier.start_with?(skipped_testsuite)
+          end
+          skipped_tests_identifiers.concat(derived_skipped_tests)
+        end
+
+        UI.verbose("Removing skipped tests: #{skipped_tests_identifiers.join("\n\t")}")
+        test_identifiers.reject { |test_identifier| skipped_tests_identifiers.include?(test_identifier) }
+      end
+
       def self.xctest_bundle_path(xctestrun_rootpath, xctestrun_config)
         xctest_host_path = xctestrun_config['TestHostPath'].sub('__TESTROOT__', xctestrun_rootpath)
         xctestrun_config['TestBundlePath'].sub('__TESTHOST__', xctest_host_path).sub('__TESTROOT__', xctestrun_rootpath)

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

@@ -34,7 +34,8 @@ module TestCenter
             print line
           end
           state = :ready_to_work
-          @options[:test_batch_results] << (@reader.gets == 'true')
+
+          @options[:test_batch_results] << (@reader.gets.chomp.to_s == 'true')
         end
 
         def run(run_options)
@@ -50,6 +51,7 @@ module TestCenter
               puts e.message
               puts e.backtrace.inspect
             ensure
+              print_final_results(tests_passed)
               handle_child_process_results(tests_passed)
               exit!
             end
@@ -57,6 +59,10 @@ module TestCenter
           close_parent_process_writer
         end
 
+        def print_final_results(tests_passed)
+          FastlaneCore::UI.verbose("All tests passed for batch #{@options[:batch_index] + 1}? #{tests_passed}")
+        end
+
         def open_interprocess_communication
           # This is performed in the Parent process in preparation to setup
           # the STDOUT and STDOUT for printing messages from the Child process

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

@@ -94,6 +94,8 @@ module TestCenter
         # after_testrun methods
 
         def after_testrun(exception = nil)
+          move_simulator_logs_for_next_run
+
           @testrun_count = @testrun_count + 1
           if exception.kind_of?(FastlaneCore::Interface::FastlaneTestFailure)
             after_testrun_message = "Scan found failing tests"
@@ -267,6 +269,19 @@ module TestCenter
           test_session_last_messages = test_session.read
         end
 
+        def move_simulator_logs_for_next_run
+          return unless @options[:include_simulator_logs]
+
+          glob_pattern = "#{output_directory}/system_logs-*.{log,logarchive}"
+          logs = Dir.glob(glob_pattern)
+          logs.each do |log_filepath|
+            new_logname = "try-#{testrun_count}-#{File.basename(log_filepath)}"
+            new_log_filepath = "#{File.dirname(log_filepath)}/#{new_logname}"
+            FastlaneCore::UI.verbose("Moving simulator log '#{log_filepath}' to '#{new_log_filepath}'")
+            File.rename(log_filepath, new_log_filepath)
+          end
+        end
+
         def move_test_result_bundle_for_next_run
           return unless @options[:result_bundle]
 
@@ -279,6 +294,7 @@ module TestCenter
           dst_test_bundle_parent_dir = File.dirname(src_test_bundle)
           dst_test_bundle_basename = File.basename(src_test_bundle, '.test_result')
           dst_test_bundle = "#{dst_test_bundle_parent_dir}/#{dst_test_bundle_basename}-#{@testrun_count}.test_result"
+          FastlaneCore::UI.verbose("Moving test_result '#{src_test_bundle}' to '#{dst_test_bundle}'")
           File.rename(src_test_bundle, dst_test_bundle)
         end
       end

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

@@ -40,19 +40,28 @@ module TestCenter
         end
 
         def run
+          ScanHelper.remove_preexisting_simulator_logs(@options)
           remove_preexisting_test_result_bundles
 
           tests_passed = false
-          if @options[:invocation_based_tests] && @options[:only_testing].nil?
-            tests_passed = run_first_run_of_invocation_based_tests
+          if should_run_tests_through_single_try?
+            tests_passed = run_tests_through_single_try
           end
 
           unless tests_passed || @options[:try_count] < 1
             setup_testcollector  
-            run_test_batches
+            tests_passed = run_test_batches
           end
+          tests_passed
         end
         
+        def should_run_tests_through_single_try?
+          should_run_for_invocation_tests = @options[:invocation_based_tests] && @options[:only_testing].nil?
+          should_run_for_skip_build = @options[:skip_build]
+          (should_run_for_invocation_tests || should_run_for_skip_build)
+        end
+
+
         def remove_preexisting_test_result_bundles
           return unless @options[:result_bundle]
 
@@ -67,9 +76,11 @@ module TestCenter
           end
         end
 
-        def run_first_run_of_invocation_based_tests
+        def run_tests_through_single_try
           FastlaneCore::UI.verbose("Running invocation tests")
-          @options[:skip_testing] = @options[:skip_testing]&.map(&:strip_testcase)&.uniq
+          if @options[:invocation_based_tests]
+            @options[:skip_testing] = @options[:skip_testing]&.map(&:strip_testcase)&.uniq
+          end
           @options[:output_directory] = output_directory
           @options[:destination] = Scan.config[:destination]
           
@@ -94,13 +105,13 @@ module TestCenter
               junit: File.absolute_path(report_filepath)
             }
           )
-          @options[:only_testing] = retrieve_failed_invocation_tests[:failed]
+          @options[:only_testing] = retrieve_failed_single_try_tests
           @options[:only_testing] = @options[:only_testing].map(&:strip_testcase).uniq
           
           tests_passed
         end
         
-        def retrieve_failed_invocation_tests
+        def retrieve_failed_single_try_tests
           reportnamer = ReportNameHelper.new(
             @options[:output_types],
             @options[:output_files],
@@ -113,7 +124,7 @@ module TestCenter
               junit: File.absolute_path(report_filepath)
             }
           )
-          Fastlane::Actions::TestsFromJunitAction.run(config)
+          Fastlane::Actions::TestsFromJunitAction.run(config)[:failed]
         end
 
         def run_test_batches
@@ -133,7 +144,8 @@ module TestCenter
           end
           pool.wait_for_all_workers
           collate_batched_reports
-          test_batch_results.reduce(true) { |a, t| a && t }
+          FastlaneCore::UI.verbose("Results for each test run: #{test_batch_results}")
+          test_batch_results.all?
         end
 
         def scan_options_for_worker(test_batch, batch_index)

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

@@ -15,8 +15,10 @@ module TestCenter
 
         def run(run_options)
           self.state = :working
-          @options[:test_batch_results] << RetryingScan.run(@options.merge(run_options))
+          test_batch_worker_final_result = RetryingScan.run(@options.merge(run_options))
+          @options[:test_batch_results] << test_batch_worker_final_result
           self.state = :ready_to_work
+          test_batch_worker_final_result
         end
       end
     end

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

@@ -10,4 +10,40 @@ module ScanHelper
     )
     # :nocov:
   end
-end
+
+  def self.remove_preexisting_simulator_logs(params)
+    return unless params[:include_simulator_logs]
+
+    output_directory = File.absolute_path(params.fetch(:output_directory, 'test_results'))
+
+    glob_pattern = "#{output_directory}/**/system_logs-*.{log,logarchive}"
+    logs = Dir.glob(glob_pattern)
+    FileUtils.rm_rf(logs)
+  end
+
+  def self.scan_options_from_multi_scan_options(params)
+    valid_scan_keys = Fastlane::Actions::ScanAction.available_options.map(&:key)
+    params.select { |k,v| valid_scan_keys.include?(k) }
+  end
+
+  def self.options_from_configuration_file(params)
+    config = FastlaneCore::Configuration.create(
+      Fastlane::Actions::ScanAction.available_options,
+      params
+    )
+    config_file = config.load_configuration_file(Scan.scanfile_name, nil, true)
+
+    overridden_options = config_file ? config_file.options : {}
+
+    FastlaneCore::Project.detect_projects(config)
+    project = FastlaneCore::Project.new(config)
+    
+    imported_path = File.expand_path(Scan.scanfile_name)
+    Dir.chdir(File.expand_path("..", project.path)) do
+      config_file = config.load_configuration_file(Scan.scanfile_name, nil, true) unless File.expand_path(Scan.scanfile_name) == imported_path
+      overridden_options.merge!(config_file.options) if config_file
+    end
+    overridden_options
+  end
+end
+

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

@@ -16,6 +16,9 @@ module TestCenter
           FastlaneCore::UI.user_error!("Error: cannot find xctestrun file '#{@xctestrun_path}'")
         end
         @only_testing = options[:only_testing]
+        if @only_testing.kind_of?(String)
+          @only_testing = @only_testing.split(',')
+        end
         @skip_testing = options[:skip_testing]
         @invocation_based_tests = options[:invocation_based_tests]
         @batch_count = options[:batch_count]

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.8.0.parallelizing.beta.8"
+    VERSION = "3.8.0.parallelizing.beta.9"
   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.8
+  version: 3.8.0.parallelizing.beta.9
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.1.8
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement