fix tests

Author: rickeylev

python/private/pypi/whl_library_targets.bzl

@@ -108,6 +108,7 @@ def whl_library_targets(
         *,
         name,
         dep_template,
+        sdist_filename = None,
         data_exclude = [],
         srcs_exclude = [],
         tags = [],
@@ -135,10 +136,10 @@ def whl_library_targets(
     Args:
         name: {type}`str` The file to match for including it into the `whl`
             filegroup. This may be also parsed to generate extra metadata.
-        sdist_filename: {type}`str | None` If the wheel was built from an sdist,
-            the filename of the sdist.
         dep_template: {type}`str` The dep_template to use for dependency
             interpolation.
+        sdist_filename: {type}`str | None` If the wheel was built from an sdist,
+            the filename of the sdist.
         tags: {type}`list[str]` The tags set on the `py_library`.
         dependencies: {type}`list[str]` A list of dependencies.
         dependencies_by_platform: {type}`dict[str, list[str]]` A list of

tests/pypi/pkg_aliases/pkg_aliases_test.bzl

@@ -43,6 +43,7 @@ def _test_legacy_aliases(env):
         "whl": "@repo//:whl",
         "data": "@repo//:data",
         "dist_info": "@repo//:dist_info",
+        "extracted_whl_files": "@repo//:extracted_whl_files",
         "my_special": "@repo//:my_special",
     }
 
@@ -242,6 +243,10 @@ def _test_group_aliases(env):
             "name": "dist_info",
             "actual": "@repo//:dist_info",
         },
+        {
+            "name": "extracted_whl_files",
+            "actual": "@repo//:extracted_whl_files",
+        },
         {
             "name": "pkg",
             "actual": "//_groups:my_group_pkg",

tests/pypi/whl_library_targets/whl_library_targets_tests.bzl

@@ -27,9 +27,9 @@ _tests = []
 def _test_filegroups(env):
     calls = []
 
-    def glob(match, *, allow_empty):
+    def glob(include, *, exclude = [], allow_empty):
         env.expect.that_bool(allow_empty).equals(True)
-        return match
+        return include
 
     whl_library_targets(
         name = "",
@@ -41,7 +41,7 @@ def _test_filegroups(env):
         rules = struct(),
     )
 
-    env.expect.that_collection(calls).contains_exactly([
+    env.expect.that_collection(calls, expr = "filegroup calls").contains_exactly([
         {
             "name": "dist_info",
             "srcs": ["site-packages/*.dist-info/**"],
@@ -52,6 +52,11 @@ def _test_filegroups(env):
             "srcs": ["data/**"],
             "visibility": ["//visibility:public"],
         },
+        {
+            "name": "extracted_whl_files",
+            "srcs": ["**"],
+            "visibility": ["//visibility:public"],
+        },
         {
             "name": "whl",
             "srcs": [""],