fix(job_attachments): handle case-insensitive path extraction on Windows

Signed-off-by: Gahyun Suh <[email protected]>
aws-deadline · Apr 7, 2024 · d670896 · d670896
1 parent cfbff76
commit d670896
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 2 deletions.
diff --git a/src/deadline/job_attachments/upload.py b/src/deadline/job_attachments/upload.py
@@ -906,9 +906,13 @@ def _find_matched_root_from_local_type_locations(
                 )
             return matched_root
         else:
+            keys_normcase = [os.path.normcase(key) for key in groupings.keys()]
             top_directory = PurePath(abs_path).parts[0]
-            if top_directory not in groupings:
+            top_directory_normcase = os.path.normcase(top_directory)
+            if top_directory_normcase not in keys_normcase:
                 groupings[top_directory] = AssetRootGroup()
+            else:
+                return top_directory_normcase 
             return top_directory
 
     def _get_total_size_of_files(self, paths: list[str]) -> int:

diff --git a/test/unit/deadline_job_attachments/test_upload.py b/test/unit/deadline_job_attachments/test_upload.py
@@ -1980,6 +1980,28 @@ def test_get_file_system_locations_by_type(
                 {},  # File System Location (SHARED type)
                 [],
             ),
+            (
+                {
+                    "/home/username/DOCS/inputs/input1.txt",
+                    "/HOME/username/DOCS/inputs/input2.txt",
+                },  # input paths
+                {"/home/username/docs/outputs"},  # output paths
+                set(),  # referenced paths
+                {},  # File System Location (LOCAL type)
+                {},  # File System Location (SHARED type)
+                [
+                    AssetRootGroup(
+                        root_path="/",
+                        inputs={
+                            Path("/home/username/DOCS/inputs/input1.txt"),
+                            Path("/HOME/username/DOCS/inputs/input2.txt"),
+                        },
+                        outputs={
+                            Path("/home/username/docs/outputs"),
+                        },
+                    ),
+                ],
+            ),
             (
                 {"/home/username/docs/inputs/input1.txt"},  # input paths
                 {"/home/username/docs/outputs"},  # output paths
@@ -2122,6 +2144,42 @@ def test_get_asset_groups(
                 {},  # File System Location (SHARED type)
                 [],
             ),
+            (
+                {"d:\\USERNAME\\DOCS\\inputs\\input1.txt"},  # input paths
+                {"D:\\username\\docs\\outputs"},  # output paths
+                set(),  # referenced paths
+                {},  # File System Location (LOCAL type)
+                {},  # File System Location (SHARED type)
+                [
+                    AssetRootGroup(
+                        root_path="D:\\username\\docs",
+                        inputs={
+                            Path("d:\\USERNAME\\DOCS\\inputs\\input1.txt"),
+                        },
+                        outputs={
+                            Path("D:\\username\\docs\\outputs"),
+                        },
+                    ),
+                ],
+            ),
+            (
+                {"D:\\username\\docs\\inputs\\input1.txt"},  # input paths
+                {"d:\\USERNAME\\DOCS\\outputs"},  # output paths
+                set(),  # referenced paths
+                {},  # File System Location (LOCAL type)
+                {},  # File System Location (SHARED type)
+                [
+                    AssetRootGroup(
+                        root_path="D:\\username\\docs",
+                        inputs={
+                            Path("D:\\username\\docs\\inputs\\input1.txt"),
+                        },
+                        outputs={
+                            Path("d:\\USERNAME\\DOCS\\outputs"),
+                        },
+                    ),
+                ],
+            ),
             (
                 {"C:\\username\\docs\\inputs\\input1.txt"},  # input paths
                 {"C:\\username\\docs\\outputs"},  # output paths
@@ -2250,7 +2308,11 @@ def test_get_asset_groups_for_windows(
         sorted_result = sorted(result, key=lambda x: x.root_path)
         sorted_expected_result = sorted(expected_result, key=lambda x: x.root_path)
 
-        assert sorted_result == sorted_expected_result
+        assert len(sorted_result) == len(sorted_expected_result)
+        for i in range(len(sorted_result)):
+            assert sorted_result[i].root_path.upper() == sorted_expected_result[i].root_path.upper()
+            assert sorted_result[i].inputs == sorted_expected_result[i].inputs
+            assert sorted_result[i].outputs == sorted_expected_result[i].outputs
 
     @pytest.mark.skipif(
         sys.platform != "win32",