[trainer] fix issues where number of failures would always be zero (#…

…21432) * Sanitize both identifier and test case * Add unit tests * Replace String extension with individual rules with simpler `proc` regex. * Add `.gitattributes` and represent .xcresult as binary. * Revert "Add `.gitattributes` and represent .xcresult as binary." This reverts commit 0281dc5. --------- Co-authored-by: Roger Oba <rogerluan.oba@gmail.com>
fastlane · Jan 10, 2024 · dda4007 · dda4007
1 parent ebd6daf
commit dda4007
Show file tree

Hide file tree

Showing 33 changed files with 76 additions and 10 deletions.
diff --git a/trainer/lib/trainer/xcresult.rb b/trainer/lib/trainer/xcresult.rb
@@ -173,6 +173,8 @@ def all_subtests
       end
 
       def find_failure(failures)
+        sanitizer = proc { |name| name.gsub(/\W/, "_") }
+        sanitized_identifier = sanitizer.call(self.identifier)
         if self.test_status == "Failure"
           # Tries to match failure on test case name
           # Example TestFailureIssueSummary:
@@ -184,16 +186,10 @@ def find_failure(failures)
           #     or identifier: "TestThisDude/testFailureJosh2" (when Objective-C)
 
           found_failure = failures.find do |failure|
-            # Clean test_case_name to match identifier format
-            # Sanitize for Swift by replacing "." for "/"
-            # Sanitize for Objective-C by removing "-", "[", "]", and replacing " " for ?/
-            sanitized_test_case_name = failure.test_case_name
-                                              .tr(".", "/")
-                                              .tr("-", "")
-                                              .tr("[", "")
-                                              .tr("]", "")
-                                              .tr(" ", "/")
-            self.identifier == sanitized_test_case_name
+            # Sanitize both test case name and identifier in a consistent fashion, then replace all non-word
+            # chars with underscore, and compare them
+            sanitized_test_case_name = sanitizer.call(failure.test_case_name)
+            sanitized_identifier == sanitized_test_case_name
           end
           return found_failure
         else

diff --git a/...~4VqMqsI5lOfxRppnud6-VDWcNsU8J7VgFCJfW2dXPwOcAkvU-I8Um5yp9n0Zv6nr3VmcxYggaVMDFfR0U_vjKw== b/...~4VqMqsI5lOfxRppnud6-VDWcNsU8J7VgFCJfW2dXPwOcAkvU-I8Um5yp9n0Zv6nr3VmcxYggaVMDFfR0U_vjKw==
@@ -0,0 +1 @@
+[]
diff --git a/...~7tsPhGURwp2J0Yr2xLwDkXd5H9rvQnnXoc484tVlZxE0zPq6ZxlGj-xtLgKa55IRf6U1u3DcC4nThWQCFyQWtw== b/...~7tsPhGURwp2J0Yr2xLwDkXd5H9rvQnnXoc484tVlZxE0zPq6ZxlGj-xtLgKa55IRf6U1u3DcC4nThWQCFyQWtw==
diff --git a/...~7wgiMormC4x4enRXpucJYkDFXsPwlIELWjwYYthhXqpoq1Jf3-pPX5RWUJNKLGrlSAnPrunazVEyYzzqPvwMdA== b/...~7wgiMormC4x4enRXpucJYkDFXsPwlIELWjwYYthhXqpoq1Jf3-pPX5RWUJNKLGrlSAnPrunazVEyYzzqPvwMdA==
diff --git a/...~96Gg-fMtc5VM-luuv1gvnNzTxyoeYQUgP4hhLCxgMi0c2wQPCGVwRe19qboVX1d3C9dnfZsZBpqv1B28isTPXA== b/...~96Gg-fMtc5VM-luuv1gvnNzTxyoeYQUgP4hhLCxgMi0c2wQPCGVwRe19qboVX1d3C9dnfZsZBpqv1B28isTPXA==
@@ -0,0 +1 @@
+[{"name":"testmanagerd.log","type":1}]
diff --git a/...~Dy9B07v7JcxXSDNAYT_cJWr3uvut6rtl1oSlYvgZ9vg5LIfHXOR_NANkgLj-Ts9MtIpbQDWei3dntyVgyXx-UQ== b/...~Dy9B07v7JcxXSDNAYT_cJWr3uvut6rtl1oSlYvgZ9vg5LIfHXOR_NANkgLj-Ts9MtIpbQDWei3dntyVgyXx-UQ==
diff --git a/...~HDNTGnB2FATq2C5mp44gsBoqg2tGbCBxHGz-OEOd7A4lBLUy-yn6JwIRXbr8KH1IzVATAPcw3Zn6xdy7ioiLVQ== b/...~HDNTGnB2FATq2C5mp44gsBoqg2tGbCBxHGz-OEOd7A4lBLUy-yn6JwIRXbr8KH1IzVATAPcw3Zn6xdy7ioiLVQ==
diff --git a/...~HjnMbbAqP4qhK3WyCTi6tbfycJkNOUH6P4C1yK-qhxHc5VJRpQWtfEml_wNcFSW-_PemyWE9zkPyQmKvjrvmbw== b/...~HjnMbbAqP4qhK3WyCTi6tbfycJkNOUH6P4C1yK-qhxHc5VJRpQWtfEml_wNcFSW-_PemyWE9zkPyQmKvjrvmbw==
diff --git a/...~OgxMYTpxs86Jl2k5uEAKBK-WUl1KFLEpGLcYG1Zcp2XvjXeYVsGbuW4XAKDQL8BC9Uk4onT3R_BhKU1jNPdjpA== b/...~OgxMYTpxs86Jl2k5uEAKBK-WUl1KFLEpGLcYG1Zcp2XvjXeYVsGbuW4XAKDQL8BC9Uk4onT3R_BhKU1jNPdjpA==
@@ -0,0 +1 @@
+[{"name":"SpaceTestsTests-537E3596-221E-4A31-9389-071C5541B922","type":2},{"name":"scheduling.log","type":1}]
diff --git a/...~SsRyiCHDfQl2m19SwdRuZY_vhc88s24Xb6jgs7SXLFpWpNV6sGPwMav-Pin-3_-rheMqlGi_0gxrcwMBrUii1w== b/...~SsRyiCHDfQl2m19SwdRuZY_vhc88s24Xb6jgs7SXLFpWpNV6sGPwMav-Pin-3_-rheMqlGi_0gxrcwMBrUii1w==
diff --git a/...~TbaJ7YZ2rLSKefY8s8kIJwRlnJw1zzAReF82HpwBmwzs1QjJVvlbAoLeLsbgckVIWionKTnQB8CXjzNyJJ-sng== b/...~TbaJ7YZ2rLSKefY8s8kIJwRlnJw1zzAReF82HpwBmwzs1QjJVvlbAoLeLsbgckVIWionKTnQB8CXjzNyJJ-sng==
diff --git a/...~YxHeunnkhdMlia-g23AMt_6XVxlW2CHTRsWKIgO1KJGUokPzoO6JZCzw9bzjIlUW0FEenbUTiQOnK9EVS388KA== b/...~YxHeunnkhdMlia-g23AMt_6XVxlW2CHTRsWKIgO1KJGUokPzoO6JZCzw9bzjIlUW0FEenbUTiQOnK9EVS388KA==
diff --git a/...~aC_M8PwRbiGMJPd_fGN8QYgz05tLco7dDKBMF8UT-8mGYSsYRts4ieQBgbpqDMzMH419zNEJKIcmqFfnljUytA== b/...~aC_M8PwRbiGMJPd_fGN8QYgz05tLco7dDKBMF8UT-8mGYSsYRts4ieQBgbpqDMzMH419zNEJKIcmqFfnljUytA==
diff --git a/...~bc0-HDG3G9sjnJO1MxacCownHuqI7v_dC_54GWNc4luhzWVZD3LFEVvG-mRQNwwIkPE66UKlH8zZJqGovjviAg== b/...~bc0-HDG3G9sjnJO1MxacCownHuqI7v_dC_54GWNc4luhzWVZD3LFEVvG-mRQNwwIkPE66UKlH8zZJqGovjviAg==
diff --git a/...~jmAosCXh5KF2Um2yHXkDITU_RJ5Wo2rpHVk7fxekThnBvAlAtUwp_0xEUsHc1cZohuP5ljks-vA49BtNCSiKcA== b/...~jmAosCXh5KF2Um2yHXkDITU_RJ5Wo2rpHVk7fxekThnBvAlAtUwp_0xEUsHc1cZohuP5ljks-vA49BtNCSiKcA==
diff --git a/...~minvEuWnOqyIKSjgc-6Q7vITnmIGNrfhOFVCLd1WugzmLC6RsFTPwE6trHssX-o-zTstvD4Rl4wHcvRyRRRZxA== b/...~minvEuWnOqyIKSjgc-6Q7vITnmIGNrfhOFVCLd1WugzmLC6RsFTPwE6trHssX-o-zTstvD4Rl4wHcvRyRRRZxA==
diff --git a/...~4VqMqsI5lOfxRppnud6-VDWcNsU8J7VgFCJfW2dXPwOcAkvU-I8Um5yp9n0Zv6nr3VmcxYggaVMDFfR0U_vjKw== b/...~4VqMqsI5lOfxRppnud6-VDWcNsU8J7VgFCJfW2dXPwOcAkvU-I8Um5yp9n0Zv6nr3VmcxYggaVMDFfR0U_vjKw==
diff --git a/...~7tsPhGURwp2J0Yr2xLwDkXd5H9rvQnnXoc484tVlZxE0zPq6ZxlGj-xtLgKa55IRf6U1u3DcC4nThWQCFyQWtw== b/...~7tsPhGURwp2J0Yr2xLwDkXd5H9rvQnnXoc484tVlZxE0zPq6ZxlGj-xtLgKa55IRf6U1u3DcC4nThWQCFyQWtw==
diff --git a/...~7wgiMormC4x4enRXpucJYkDFXsPwlIELWjwYYthhXqpoq1Jf3-pPX5RWUJNKLGrlSAnPrunazVEyYzzqPvwMdA== b/...~7wgiMormC4x4enRXpucJYkDFXsPwlIELWjwYYthhXqpoq1Jf3-pPX5RWUJNKLGrlSAnPrunazVEyYzzqPvwMdA==
diff --git a/...~96Gg-fMtc5VM-luuv1gvnNzTxyoeYQUgP4hhLCxgMi0c2wQPCGVwRe19qboVX1d3C9dnfZsZBpqv1B28isTPXA== b/...~96Gg-fMtc5VM-luuv1gvnNzTxyoeYQUgP4hhLCxgMi0c2wQPCGVwRe19qboVX1d3C9dnfZsZBpqv1B28isTPXA==
diff --git a/...~Dy9B07v7JcxXSDNAYT_cJWr3uvut6rtl1oSlYvgZ9vg5LIfHXOR_NANkgLj-Ts9MtIpbQDWei3dntyVgyXx-UQ== b/...~Dy9B07v7JcxXSDNAYT_cJWr3uvut6rtl1oSlYvgZ9vg5LIfHXOR_NANkgLj-Ts9MtIpbQDWei3dntyVgyXx-UQ==
diff --git a/...~HDNTGnB2FATq2C5mp44gsBoqg2tGbCBxHGz-OEOd7A4lBLUy-yn6JwIRXbr8KH1IzVATAPcw3Zn6xdy7ioiLVQ== b/...~HDNTGnB2FATq2C5mp44gsBoqg2tGbCBxHGz-OEOd7A4lBLUy-yn6JwIRXbr8KH1IzVATAPcw3Zn6xdy7ioiLVQ==
diff --git a/...~HjnMbbAqP4qhK3WyCTi6tbfycJkNOUH6P4C1yK-qhxHc5VJRpQWtfEml_wNcFSW-_PemyWE9zkPyQmKvjrvmbw== b/...~HjnMbbAqP4qhK3WyCTi6tbfycJkNOUH6P4C1yK-qhxHc5VJRpQWtfEml_wNcFSW-_PemyWE9zkPyQmKvjrvmbw==
diff --git a/...~OgxMYTpxs86Jl2k5uEAKBK-WUl1KFLEpGLcYG1Zcp2XvjXeYVsGbuW4XAKDQL8BC9Uk4onT3R_BhKU1jNPdjpA== b/...~OgxMYTpxs86Jl2k5uEAKBK-WUl1KFLEpGLcYG1Zcp2XvjXeYVsGbuW4XAKDQL8BC9Uk4onT3R_BhKU1jNPdjpA==
diff --git a/...~SsRyiCHDfQl2m19SwdRuZY_vhc88s24Xb6jgs7SXLFpWpNV6sGPwMav-Pin-3_-rheMqlGi_0gxrcwMBrUii1w== b/...~SsRyiCHDfQl2m19SwdRuZY_vhc88s24Xb6jgs7SXLFpWpNV6sGPwMav-Pin-3_-rheMqlGi_0gxrcwMBrUii1w==
diff --git a/...~TbaJ7YZ2rLSKefY8s8kIJwRlnJw1zzAReF82HpwBmwzs1QjJVvlbAoLeLsbgckVIWionKTnQB8CXjzNyJJ-sng== b/...~TbaJ7YZ2rLSKefY8s8kIJwRlnJw1zzAReF82HpwBmwzs1QjJVvlbAoLeLsbgckVIWionKTnQB8CXjzNyJJ-sng==
diff --git a/...~YxHeunnkhdMlia-g23AMt_6XVxlW2CHTRsWKIgO1KJGUokPzoO6JZCzw9bzjIlUW0FEenbUTiQOnK9EVS388KA== b/...~YxHeunnkhdMlia-g23AMt_6XVxlW2CHTRsWKIgO1KJGUokPzoO6JZCzw9bzjIlUW0FEenbUTiQOnK9EVS388KA==
diff --git a/...~aC_M8PwRbiGMJPd_fGN8QYgz05tLco7dDKBMF8UT-8mGYSsYRts4ieQBgbpqDMzMH419zNEJKIcmqFfnljUytA== b/...~aC_M8PwRbiGMJPd_fGN8QYgz05tLco7dDKBMF8UT-8mGYSsYRts4ieQBgbpqDMzMH419zNEJKIcmqFfnljUytA==
diff --git a/...~bc0-HDG3G9sjnJO1MxacCownHuqI7v_dC_54GWNc4luhzWVZD3LFEVvG-mRQNwwIkPE66UKlH8zZJqGovjviAg== b/...~bc0-HDG3G9sjnJO1MxacCownHuqI7v_dC_54GWNc4luhzWVZD3LFEVvG-mRQNwwIkPE66UKlH8zZJqGovjviAg==
diff --git a/...~jmAosCXh5KF2Um2yHXkDITU_RJ5Wo2rpHVk7fxekThnBvAlAtUwp_0xEUsHc1cZohuP5ljks-vA49BtNCSiKcA== b/...~jmAosCXh5KF2Um2yHXkDITU_RJ5Wo2rpHVk7fxekThnBvAlAtUwp_0xEUsHc1cZohuP5ljks-vA49BtNCSiKcA==
diff --git a/...~minvEuWnOqyIKSjgc-6Q7vITnmIGNrfhOFVCLd1WugzmLC6RsFTPwE6trHssX-o-zTstvD4Rl4wHcvRyRRRZxA== b/...~minvEuWnOqyIKSjgc-6Q7vITnmIGNrfhOFVCLd1WugzmLC6RsFTPwE6trHssX-o-zTstvD4Rl4wHcvRyRRRZxA==
diff --git a/trainer/spec/fixtures/Test.with_spaces.xcresult/Info.plist b/trainer/spec/fixtures/Test.with_spaces.xcresult/Info.plist
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>dateCreated</key>
+	<date>2023-07-31T19:01:10Z</date>
+	<key>externalLocations</key>
+	<array/>
+	<key>rootId</key>
+	<dict>
+		<key>hash</key>
+		<string>0~SsRyiCHDfQl2m19SwdRuZY_vhc88s24Xb6jgs7SXLFpWpNV6sGPwMav-Pin-3_-rheMqlGi_0gxrcwMBrUii1w==</string>
+	</dict>
+	<key>storage</key>
+	<dict>
+		<key>backend</key>
+		<string>fileBacked2</string>
+		<key>compression</key>
+		<string>standard</string>
+	</dict>
+	<key>version</key>
+	<dict>
+		<key>major</key>
+		<integer>3</integer>
+		<key>minor</key>
+		<integer>39</integer>
+	</dict>
+</dict>
+</plist>
diff --git a/trainer/spec/test_parser_spec.rb b/trainer/spec/test_parser_spec.rb
@@ -207,6 +207,44 @@
         expect(failure_messages).to eq(["XCTAssertTrue failed", "XCTAssertTrue failed"])
         RSpec::Mocks.space.proxy_for(Trainer::XCResult::TestFailureIssueSummary).reset
       end
+
+      it "works as expected with xcresult with spaces", requires_xcode: true do
+        tp = Trainer::TestParser.new("./trainer/spec/fixtures/Test.with_spaces.xcresult")
+        expect(tp.data).to eq([
+                                {
+                                  project_path: "SpaceTests.xcodeproj",
+                                  target_name: "SpaceTestsTests",
+                                  test_name: "SpaceTestsTests",
+                                  configuration_name: "Test Scheme Action",
+                                  duration: 0.21180307865142822,
+                                  tests: [
+                                    {
+                                      identifier: "SpaceTestsSpec.a test with spaces, should always fail()",
+                                      name: "a test with spaces, should always fail()",
+                                      duration: 0.21180307865142822,
+                                      status: "Failure",
+                                      test_group: "SpaceTestsSpec",
+                                      guid: "",
+                                      failures: [
+                                        {
+                                          failure_message: "expected to equal <1>, got <2>\n (/Users/mahmood.tahir/Developer/SpaceTests/SpaceTestsTests/TestSpec.swift#CharacterRangeLen=0&EndingLineNumber=15&StartingLineNumber=15)",
+                                          file_name: "",
+                                          line_number: 0,
+                                          message: "",
+                                          performance_failure: {}
+                                        }
+                                      ]
+                                    }
+                                  ],
+                                  number_of_tests: 1,
+                                  number_of_failures: 1,
+                                  number_of_skipped: 0,
+                                  number_of_tests_excluding_retries: 1,
+                                  number_of_failures_excluding_retries: 1,
+                                  number_of_retries: 0
+                                }
+                              ])
+      end
     end
   end
 end