Fixed test cases and minor issues in logic

Author: MichaelSun48

src/sentry/integrations/utils/code_mapping.py

@@ -86,6 +86,10 @@ def __init__(self, frame_file_path: str) -> None:
         # Remove drive letter if it exists
         if is_windows_path and frame_file_path[1] == ":":
             frame_file_path = frame_file_path[2:]
+            # windows drive letters can be like C:\ or C:
+            # so we need to remove the slash if it exists
+            if frame_file_path[0] == "/":
+                frame_file_path = frame_file_path[1:]
 
         start_at_index = get_straight_path_prefix_end_index(frame_file_path)
         self.straight_path_prefix = frame_file_path[:start_at_index]
@@ -157,7 +161,7 @@ def list_file_matches(self, frame_filename: FrameFilename) -> list[dict[str, str
                     )
                     continue
 
-                if stack_path.replace(stack_root, source_root, 1) != source_path:
+                if stack_path.replace(stack_root, source_root, 1).replace("\\", "/") != source_path:
                     logger.info(
                         "Unexpected stack_path/source_path found. A code mapping was not generated.",
                         extra={
@@ -271,7 +275,7 @@ def _generate_code_mapping_from_tree(
             )
             return []
 
-        if stack_path.replace(stack_root, source_root, 1) != source_path:
+        if stack_path.replace(stack_root, source_root, 1).replace("\\", "/") != source_path:
             logger.info(
                 "Unexpected stack_path/source_path found. A code mapping was not generated.",
                 extra={
@@ -521,8 +525,8 @@ def find_roots(stack_path: str, source_path: str) -> tuple[str, str]:
     If there is no overlap, raise an exception since this should not happen
     """
     stack_root = ""
-    if stack_path[0] == "/":
-        stack_root += "/"
+    if stack_path[0] == "/" or stack_path[0] == "\\":
+        stack_root += stack_path[0]
         stack_path = stack_path[1:]
 
     if stack_path == source_path:
@@ -550,7 +554,7 @@ def find_roots(stack_path: str, source_path: str) -> tuple[str, str]:
             source_root = source_path.rpartition(overlap)[0]
             stack_root += stack_path_delim.join(stack_root_items)
 
-            if stack_root and stack_root[-1] != SLASH:  # append trailing slash
+            if stack_root and stack_root[-1] != stack_path_delim:  # append trailing slash
                 stack_root = f"{stack_root}{stack_path_delim}"
             if source_root and source_root[-1] != SLASH:
                 source_root = f"{source_root}{SLASH}"

tests/sentry/integrations/utils/test_code_mapping.py

@@ -48,7 +48,6 @@
     "README",  # no extension
     "ssl.py",
     # XXX: The following will need to be supported
-    "C:\\Users\\Donia\\AppData\\Roaming\\Adobe\\UXP\\Plugins\\External\\452f92d2_0.13.0\\main.js",
     "initialization.dart",
     "backburner.js",
 ]

tests/sentry/tasks/test_derive_code_mappings.py

@@ -105,7 +105,7 @@ def setUp(self):
             [
                 {"in_app": True, "filename": "\\sentry\\mouse.py"},
                 {"in_app": True, "filename": "\\sentry\\dog\\cat\\parrot.py"},
-                {"in_app": True, "filename": "C:\\sentry\\tasks.py"},
+                {"in_app": True, "filename": "C:sentry\\tasks.py"},
                 {"in_app": True, "filename": "D:\\Users\\code\\sentry\\models\\release.py"},
             ]
         )
@@ -136,8 +136,8 @@ def test_backslash_drive_letter_filename_simple(self):
             }
             derive_code_mappings(self.project.id, self.event_data)
             code_mapping = RepositoryProjectPathConfig.objects.all()[0]
-            assert code_mapping.stack_root == "C:\\"
-            assert code_mapping.source_root == ""
+            assert code_mapping.stack_root == "C:sentry\\"
+            assert code_mapping.source_root == "sentry/"
             assert code_mapping.repository.name == repo_name
 
     @responses.activate
@@ -151,8 +151,8 @@ def test_backslash_drive_letter_filename_monorepo(self):
             }
             derive_code_mappings(self.project.id, self.event_data)
             code_mapping = RepositoryProjectPathConfig.objects.all()[0]
-            assert code_mapping.stack_root == "C:\\sentry\\"
-            assert code_mapping.source_root == "src/"
+            assert code_mapping.stack_root == "C:sentry\\"
+            assert code_mapping.source_root == "src/sentry/"
             assert code_mapping.repository.name == repo_name
 
     @responses.activate