From 8d49b05eb2af5a90f2727d032252d2a55555bd0a Mon Sep 17 00:00:00 2001 From: Corey Werner Date: Wed, 14 Apr 2021 11:33:18 +0300 Subject: [PATCH 1/2] retry test shouldnt remove initial xcresult --- scan/lib/scan/runner.rb | 2 ++ scan/lib/scan/test_command_generator.rb | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scan/lib/scan/runner.rb b/scan/lib/scan/runner.rb index e5ce644754b..54f99bb4eef 100644 --- a/scan/lib/scan/runner.rb +++ b/scan/lib/scan/runner.rb @@ -55,6 +55,8 @@ def test_app end def execute(retries: 0) + Scan.cache[:retry_attempt] = Scan.config[:number_of_retries] - retries + command = @test_command_generator.generate prefix_hash = [ diff --git a/scan/lib/scan/test_command_generator.rb b/scan/lib/scan/test_command_generator.rb index 9be93e7b510..b2107150b71 100644 --- a/scan/lib/scan/test_command_generator.rb +++ b/scan/lib/scan/test_command_generator.rb @@ -164,8 +164,9 @@ def build_path # The path to the result bundle def result_bundle_path + attempt = Scan.cache[:retry_attempt] > 0 ? "-#{Scan.cache[:retry_attempt]}" : "" ext = FastlaneCore::Helper.xcode_version.to_i >= 11 ? '.xcresult' : '.test_result' - path = File.join(Scan.config[:output_directory], Scan.config[:scheme]) + ext + path = File.join(Scan.config[:output_directory], Scan.config[:scheme]) + attempt + ext if File.directory?(path) FileUtils.remove_dir(path) end From fd0ee64906858c335969b3b620789d443dd82b7c Mon Sep 17 00:00:00 2001 From: Corey Werner Date: Wed, 14 Apr 2021 12:53:01 +0300 Subject: [PATCH 2/2] fix tests --- scan/lib/scan/test_command_generator.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scan/lib/scan/test_command_generator.rb b/scan/lib/scan/test_command_generator.rb index b2107150b71..050179bfa8f 100644 --- a/scan/lib/scan/test_command_generator.rb +++ b/scan/lib/scan/test_command_generator.rb @@ -164,7 +164,8 @@ def build_path # The path to the result bundle def result_bundle_path - attempt = Scan.cache[:retry_attempt] > 0 ? "-#{Scan.cache[:retry_attempt]}" : "" + retry_count = Scan.cache[:retry_attempt] || 0 + attempt = retry_count > 0 ? "-#{retry_count}" : "" ext = FastlaneCore::Helper.xcode_version.to_i >= 11 ? '.xcresult' : '.test_result' path = File.join(Scan.config[:output_directory], Scan.config[:scheme]) + attempt + ext if File.directory?(path)