Bug 1686488 [wpt PR 27148] - wptserve: correct sorting in DirectoryHa…

…ndler, a=testonly

Automatic update from web-platform-tests
wptserve: correct sorting in DirectoryHandler

Found this while creating web-platform-tests/wpt#27129.

--

wpt-commits: b4c87a442f82ff5e1de9a94e735b7b6c5f2e60c5
wpt-pr: 27148

testing/web-platform/tests/tools/wptserve/wptserve/handlers.py

@@ -98,7 +98,9 @@ def list_items(self, base_path, path):
                    {"link": link, "name": ".."})
         items = []
         prev_item = None
-        for item in sorted(os.listdir(path)):
+        # This ensures that .headers always sorts after the file it provides the headers for. E.g.,
+        # if we have x, x-y, and x.headers, the order will be x, x.headers, and then x-y.
+        for item in sorted(os.listdir(path), key=lambda x: (x[:-len(".headers")], x) if x.endswith(".headers") else (x, x)):
             if prev_item and prev_item + ".headers" == item:
                 items[-1][1] = item
                 prev_item = None