Add an actual test

Author: Shayan Hoshyari

python/private/py_executable.bzl

@@ -633,7 +633,6 @@ def _create_venv(ctx, output_prefix, imports, runtime_details, add_runfiles_root
         # to `_main` prefix, and binaries from non-root module become broken.
         lib_runfiles = ctx.runfiles(
             root_symlinks = venv_app_files.runfiles_symlinks,
-            ##symlinks = venv_app_files.runfiles_symlinks,
         ),
     )
 

python/private/venv_runfiles.bzl

@@ -68,7 +68,6 @@ def create_venv_app_files(ctx, deps, venv_dir_map):
                 # runfile_prefix should be prepended as we use runfiles.root_symlinks
                 runfile_prefix = ctx.label.repo_name or ctx.workspace_name
                 symlink_from = paths.join(runfile_prefix, ctx.label.package, bin_venv_path)
-                ##symlink_from = paths.join(ctx.label.package, bin_venv_path)
 
                 runfiles_symlinks[symlink_from] = link_to
             else:

tests/modules/other/BUILD.bazel

@@ -18,8 +18,10 @@ py_binary(
     name = "venv_bin",
     srcs = ["venv_bin.py"],
     config_settings = {
-        "@rules_python//python/config_settings:venvs_site_packages": "yes",
         "@rules_python//python/config_settings:bootstrap_impl": "script",
+        # To make paths we are using in the test deterministic
+        "@rules_python//python/config_settings:python_version": "3.13",
+        "@rules_python//python/config_settings:venvs_site_packages": "yes",
     },
     deps = [
         # Add two packages that install into the same directory. This is

tests/modules/other/venv_bin.py

@@ -3,4 +3,4 @@
 import nspkg.subnspkg.delta
 import nspkg.subnspkg.gamma
 
-print("hi")
+print("@other//:venv_bin ran successfully.")

tests/venv_site_packages_libs/BUILD.bazel

@@ -1,3 +1,4 @@
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//python:py_library.bzl", "py_library")
 load("//tests/support:py_reconfig.bzl", "py_reconfig_test")
 load(
@@ -19,6 +20,17 @@ py_library(
     ],
 )
 
+sh_test(
+    name = "py_binary_other_module_test",
+    srcs = [
+        "py_binary_other_module_test.sh",
+    ],
+    data = [
+        "@other//:venv_bin",
+    ],
+    target_compatible_with = NOT_WINDOWS,
+)
+
 py_reconfig_test(
     name = "venvs_site_packages_libs_test",
     srcs = ["bin.py"],

tests/venv_site_packages_libs/py_binary_other_module_test.sh

@@ -0,0 +1,44 @@
+#
+# Test that for a py_binary from a dependency module, we place links created via runfiles(...)
+# in the right place. This tests the fix made for issues/3503
+#
+
+set -eu
+
+# Helper to check links exist and where they point to
+check_link() {
+  link=$1
+
+  # 1) Must exist
+  if [ ! -e "$link" ]; then
+    return 1
+  fi
+
+  # 2) Must be a symlink
+  if [ ! -L "$link" ]; then
+    return 1
+  fi
+}
+
+ensure_link() {
+  if ! check_link $1; then
+    echo "ERROR: $link does not exist"
+    return 1
+  fi
+}
+
+# Sanity check that invalid files don't exist.
+echo "[*] Sanity check our ensure_link function"
+if check_link ${RUNFILES_DIR}/__I_DO_NOT_EXIST__; then
+  echo "Check link function is broken"
+  exit 1
+fi
+
+# Check the links exist in the correct place.
+echo "[*] Testing existence of symlinks in the right place"
+ensure_link ${RUNFILES_DIR}/other+/_venv_bin.venv/lib/python3.13/site-packages/nspkg/subnspkg/delta/__init__.py
+ensure_link ${RUNFILES_DIR}/other+/_venv_bin.venv/lib/python3.13/site-packages/nspkg/subnspkg/gamma/__init__.py
+
+# Finally, test that running the binary works, i.e imports are resolved.
+echo "[*] Testing running the binary"
+${RUNFILES_DIR}/other+/venv_bin