repo: support custom metadata cache path for ebuild repo regen

Author: radhermit

src/pkgcraft/C.pxd

@@ -1565,7 +1565,7 @@ cdef extern from "pkgcraft.h":
     #
     # # Safety
     # The argument must be a non-null Repo pointer.
-    bool pkgcraft_repo_ebuild_pkg_metadata_regen(Repo *r, uintptr_t jobs, bool force)
+    bool pkgcraft_repo_ebuild_metadata_regen(Repo *r, uintptr_t jobs, bool force, char *path)
 
     # Create an ebuild file in the repo.
     #

src/pkgcraft/repo/ebuild.pyx

@@ -1,5 +1,3 @@
-import os
-
 cimport cython
 
 from .. cimport C
@@ -54,10 +52,10 @@ cdef class EbuildRepo(Repo):
         ptr = C.pkgcraft_repo_ebuild_configure(self.ptr, config.ptr)
         return Repo.from_ptr(ptr)
 
-    def pkg_metadata_regen(self, int jobs=0, force=False):
+    def metadata_regen(self, int jobs=0, force=False, path=None):
         """Regenerate an ebuild repo's package metadata cache."""
-        jobs = jobs if jobs > 0 else os.cpu_count()
-        if not C.pkgcraft_repo_ebuild_pkg_metadata_regen(self.ptr, jobs, force):
+        cache_path = str(path) if path is not None else ""
+        if not C.pkgcraft_repo_ebuild_metadata_regen(self.ptr, jobs, force, cache_path.encode()):
             raise PkgcraftError
 
 

tests/repo/test_ebuild.py

@@ -1,5 +1,4 @@
 import os
-import shutil
 from pathlib import Path
 
 import pytest
@@ -111,29 +110,20 @@ def test_licenses(self):
         assert secondary.licenses == ["a", "b"]
 
     @pytest.mark.parallel
-    def test_pkg_metadata_regen(self, tmpdir):
-        orig_repo = TEST_DATA.repos["metadata"]
-        # copy original repo to a temp dir
-        repo_path = shutil.copytree(orig_repo.path, tmpdir.join("repo"))
-        repo = EbuildRepo(repo_path)
-        metadata_path = repo.path.joinpath("metadata/md5-cache")
-
-        def metadata_content():
+    def test_metadata_regen(self, tmpdir):
+        def metadata_content(path):
             """Yield metadata file names and content."""
-            for root, _dirs, files in os.walk(metadata_path):
+            for root, _dirs, files in os.walk(path):
                 for name in files:
                     with open(os.path.join(root, name)) as f:
                         yield (name, f.read())
 
-        # record expected metadata file content
-        expected = sorted(metadata_content())
-        # wipe metadata
-        shutil.rmtree(metadata_path)
-        # regenerate metadata
-        repo.pkg_metadata_regen()
+        repo = TEST_DATA.repos["metadata"]
+        # regenerate metadata to an external path
+        repo.metadata_regen(force=True, path=str(tmpdir))
         # verify new data matches original
-        data = sorted(metadata_content())
-        assert data == expected
+        data = sorted(metadata_content(tmpdir))
+        assert data == sorted(metadata_content(repo.path.joinpath("metadata/md5-cache")))
 
 
 class TestEbuildRepoMetadata: