fastlane-plugin-test_center 3.7.0.parallelizing.alpha.4 → 3.7.0

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

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

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

@@ -5,8 +5,6 @@ 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)
@@ -17,12 +15,10 @@ module TestCenter
         end
         @only_testing = options[:only_testing]
         @skip_testing = options[:skip_testing]
-        @batch_count = options[:batch_count]
+        @invocation_based_tests = options[:invocation_based_tests]
       end
 
       def default_derived_data_path(options)
-        # TODO: investigate if this is needed. I believe it should already have
-        # been set in multi_scan
         Scan.project = FastlaneCore::Project.new(
           options.select { |k, v| %i[workspace project].include?(k) }
         )
@@ -39,8 +35,8 @@ module TestCenter
           if @only_testing
             @testables ||= only_testing_to_testables_tests.keys
           else
-            @testables ||= Plist.parse_xml(@xctestrun_path).keys.reject do |key|
-              key == '__xctestrun_metadata__'
+            @testables ||= Plist.parse_xml(@xctestrun_path).keys.reject do |retrievedTestable| 
+              Fastlane::Actions::TestsFromXctestrunAction.ignoredTestables.include?(retrievedTestable)
             end
           end
         end
@@ -56,30 +52,19 @@ module TestCenter
         tests
       end
 
-      def xctestrun_known_tests
-        config = FastlaneCore::Configuration.create(::Fastlane::Actions::TestsFromXctestrunAction.available_options, xctestrun: @xctestrun_path)
-        ::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
-            @testables_tests = xctestrun_known_tests
+            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)
             if @skip_testing
               skipped_testable_tests = Hash.new { |h, k| h[k] = [] }
               @skip_testing.sort.each do |skipped_test_identifier|
@@ -92,30 +77,8 @@ 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/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.7.0.parallelizing.alpha.4"
+    VERSION = "3.7.0"
   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.parallelizing.alpha.4
+  version: 3.7.0
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-05-30 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: colorize
+  name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   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: cocoapods
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.108.0
+        version: 2.56.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.108.0
+        version: 2.56.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -249,29 +249,16 @@ 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/restart_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/interstitial.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/simulator_manager.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:
@@ -288,9 +275,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11

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

@@ -1,38 +0,0 @@
-module Fastlane
-  module Actions
-    class QuitCoreSimulatorServiceAction < Action
-      def self.run(params)
-        launchctl_list_count = 0
-        commands = []
-        while Actions.sh('launchctl list | grep com.apple.CoreSimulator.CoreSimulatorService || true', log: false) != ''
-          UI.crash!('Unable to quit com.apple.CoreSimulator.CoreSimulatorService after 10 tries') if (launchctl_list_count += 1) > 10
-          commands << Actions.sh('launchctl remove com.apple.CoreSimulator.CoreSimulatorService &> /dev/null || true', log: false)
-          UI.verbose('Waiting for com.apple.CoreSimulator.CoreSimulatorService to quit')
-          sleep(0.5)
-        end
-        commands
-      end
-
-      #####################################################
-      # @!group Documentation
-      #####################################################
-
-      def self.description
-        "Force-quits the com.apple.CoreSimulator.CoreSimulatorService."
-      end
-
-      def self.details
-        "Sometimes the com.apple.CoreSimulator.CoreSimulatorService can hang. " \
-        "Use this action to force-quit it."
-      end
-
-      def self.authors
-        ["lyndsey-ferguson/@lyndseydf"]
-      end
-
-      def self.is_supported?(platform)
-        platform == :ios
-      end
-    end
-  end
-end

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

@@ -1,5 +0,0 @@
-require_relative 'multi_scan_manager/interstitial'
-require_relative 'multi_scan_manager/report_collator'
-require_relative 'multi_scan_manager/simulator_manager'
-require_relative 'multi_scan_manager/runner'
-require_relative 'xctestrun_info'

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

@@ -1,30 +0,0 @@
-module FastlaneCore
-  class DeviceManager
-    class Device
-      def clone
-        raise 'Can only clone iOS Simulators' unless self.is_simulator
-        Device.new(
-          name: self.name,
-          udid: `xcrun simctl clone #{self.udid} '#{self.name}'`.chomp,
-          os_type: self.os_type,
-          os_version: self.os_version,
-          state: self.state,
-          is_simulator: self.is_simulator
-        )
-      end
-
-      def rename(newname)
-        `xcrun simctl rename #{self.udid} '#{newname}'`
-        self.name = newname
-      end
-
-      def boot
-        `xcrun simctl boot #{self.udid}`
-      end
-
-      def shutdown
-        `xcrun simctl shutdown #{self.udid}` unless self.state == "Shutdown"
-      end
-    end
-  end
-end

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

@@ -1,143 +0,0 @@
-module TestCenter
-  module Helper
-    module MultiScanManager
-      class Interstitial
-
-        attr_writer :output_directory
-        attr_writer :batch
-
-        def initialize(options)
-          @output_directory = options[:output_directory]
-          @testrun_completed_block = options[:testrun_completed_block]
-          @result_bundle = options[:result_bundle]
-          @scheme = options[:scheme]
-          @batch = options[:batch]
-          @reportnamer = options[:reportnamer]
-          @xcpretty_json_file_output = ENV['XCPRETTY_JSON_FILE_OUTPUT']
-          @parallelize = options[:parallelize]
-
-          before_all
-        end
-
-        # TODO: Should we be creating a new interstitial for each batch? yes.
-        # Should we clear out the result bundles before each batch? --> should
-        # it not be done before all batches? Same with env var for json resports.
-        def before_all
-          if @result_bundle
-            remove_preexisting_test_result_bundles
-          end
-          set_json_env_if_necessary
-          if @parallelize
-            @original_derived_data_path = ENV['SCAN_DERIVED_DATA_PATH']
-            FileUtils.mkdir_p(@output_directory)
-            ENV['SCAN_DERIVED_DATA_PATH'] = Dir.mktmpdir(nil, @output_directory)
-          end
-        end
-
-        def after_all
-          FastlaneCore::UI.message("resetting JSON ENV var to #{@xcpretty_json_file_output}")
-          ENV['XCPRETTY_JSON_FILE_OUTPUT'] = @xcpretty_json_file_output
-          if @parallelize
-            ENV['SCAN_DERIVED_DATA_PATH'] = @original_derived_data_path
-          end
-        end
-
-        def remove_preexisting_test_result_bundles
-          glob_pattern = "#{@output_directory}/.*\.test_result"
-          preexisting_test_result_bundles = Dir.glob(glob_pattern)
-          FileUtils.rm_rf(preexisting_test_result_bundles)
-        end
-
-        def move_test_result_bundle_for_next_run
-          if @result_bundle
-            built_test_result, moved_test_result = test_result_bundlepaths
-            FileUtils.mv(built_test_result, moved_test_result)
-          end
-        end
-
-        def test_result_bundlepaths
-          [
-            File.join(@output_directory, @scheme) + '.test_result',
-            File.join(@output_directory, @scheme) + "_#{@reportnamer.report_count}.test_result"
-          ]
-        end
-
-        def reset_simulators
-          destinations = Scan.config[:destination]
-          simulators = FastlaneCore::DeviceManager.simulators('iOS')
-          simulator_ids_to_reset = []
-          destinations.each do |destination|
-            destination.split(',').each do |destination_pair|
-              key, value = destination_pair.split('=')
-              if key == 'id'
-                simulator_ids_to_reset << value
-              end
-            end
-          end
-          simulators_to_reset = simulators.each.select { |simulator| simulator_ids_to_reset.include?(simulator.udid) }
-          simulators_to_reset.each do |simulator|
-            simulator.reset
-          end
-        end
-
-        def send_info_for_try(try_count)
-          puts "in send_info_for_try for #{@batch}"
-          return unless @testrun_completed_block
-
-          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)
-            }
-          )
-          junit_results = Fastlane::Actions::TestsFromJunitAction.run(config)
-          info = {
-            failed: junit_results[:failed],
-            passing: junit_results[:passing],
-            batch: @batch,
-            try_count: try_count,
-            report_filepath: report_filepath
-          }
-
-          if @reportnamer.includes_html?
-            html_report_filepath = File.join(@output_directory, @reportnamer.html_last_reportname)
-            info[:html_report_filepath] = html_report_filepath
-          end
-          if @reportnamer.includes_json?
-            json_report_filepath = File.join(@output_directory, @reportnamer.json_last_reportname)
-            info[:json_report_filepath] = json_report_filepath
-          end
-          if @result_bundle
-            test_result_suffix = '.test_result'
-            test_result_suffix.prepend("-#{@reportnamer.report_count}") unless @reportnamer.report_count.zero?
-            test_result_bundlepath = File.join(@output_directory, @scheme) + test_result_suffix
-            info[:test_result_bundlepath] = test_result_bundlepath
-          end
-          puts "interstitial about to call #{@testrun_completed_block} for batch #{@batch}"
-          @testrun_completed_block.call(info)
-        end
-
-        def set_json_env_if_necessary
-          if @reportnamer && @reportnamer.includes_json?
-            ENV['XCPRETTY_JSON_FILE_OUTPUT'] = File.join(
-              @output_directory,
-              @reportnamer.json_last_reportname
-            )
-          end
-        end
-
-        def finish_try(try_count)
-          send_info_for_try(try_count)
-          reset_simulators
-          ENV['SCAN_DERIVED_DATA_PATH'] = Dir.mktmpdir(nil, @output_directory) if @parallelize
-          move_test_result_bundle_for_next_run
-          set_json_env_if_necessary
-          @reportnamer && @reportnamer.increment
-        end
-      end
-    end
-  end
-end
-