cleanup test

Author: rickeylev

python/private/zipapp/zip_main_template.py

@@ -24,6 +24,7 @@
 import os
 from os.path import join
 import shutil
+import stat
 import subprocess
 import tempfile
 import zipfile
@@ -166,10 +167,18 @@ def extract_zip(zip_path, dest_dir):
     dest_dir = get_windows_path_with_unc_prefix(dest_dir)
     with zipfile.ZipFile(zip_path) as zf:
         for info in zf.infolist():
-            zf.extract(info, dest_dir)
-            # UNC-prefixed paths must be absolute/normalized. See
-            # https://docs.microsoft.com/en-us/windows/desktop/fileio/naming-a-file#maximum-path-length-limitation
             file_path = os.path.abspath(os.path.join(dest_dir, info.filename))
+            # If the file exists, it might be a symlink or read-only file from a previous extraction.
+            # Unlink it first so zipfile.extract doesn't corrupt the symlink target or fail on read-only files.
+            if os.path.lexists(file_path) and not os.path.isdir(file_path):
+                try:
+                    os.unlink(file_path)
+                except OSError:
+                    # On Windows, unlinking a read-only file fails.
+                    os.chmod(file_path, stat.S_IWRITE)
+                    os.unlink(file_path)
+            
+            zf.extract(info, dest_dir)
             # The Unix st_mode bits (see "man 7 inode") are stored in the upper 16
             # bits of external_attr.
             attrs = info.external_attr >> 16

tests/py_zipapp/BUILD.bazel

@@ -98,17 +98,6 @@ sh_test(
     toolchains = ["//python:current_py_toolchain"],
 )
 
-sh_test(
-    name = "extract_root_test",
-    srcs = ["extract_root_test.sh"],
-    data = [
-        ":system_python_zipapp",
-    ],
-    env = {
-        "ZIPAPP": "$(rootpath :system_python_zipapp)",
-    },
-)
-
 py_library(
     name = "some_dep",
     srcs = ["some_dep.py"],

tests/py_zipapp/extract_root_test.sh

@@ -13,6 +13,21 @@ fi
 ZIPAPP="${ZIPAPP/.exe/.zip}"
 
 export RULES_PYTHON_BOOTSTRAP_VERBOSE=1
+
 # We're testing the invocation of `__main__.py`, so we have to
 # manually pass the zipapp to python.
+echo "Running zipapp using an automatic temp directory..."
+"$PYTHON" "$ZIPAPP"
+
+echo "Running zipapp with extract root set..."
+export RULES_PYTHON_EXTRACT_ROOT="${TEST_TMPDIR:-/tmp}/extract_root_test"
+"$PYTHON" "$ZIPAPP"
+
+# Verify that the directory was created
+if [[ ! -d "$RULES_PYTHON_EXTRACT_ROOT" ]]; then
+  echo "Error: Extract root directory $RULES_PYTHON_EXTRACT_ROOT was not created!"
+  exit 1
+fi
+
+echo "Running zipapp with extract root set a second time..."
 "$PYTHON" "$ZIPAPP"