Fix Python tests

Author: jaen

flavors/lineageos/test_lineageos_updater.py

@@ -3,27 +3,36 @@
 
 from unittest.mock import patch
 from typing import Any
+import subprocess
+import textwrap
 
 import update_device_metadata
 import update_device_dirs
 
 
 def test_fetch_metadata(tmp_path: Any) -> None:
     lineage_build_targets = tmp_path / "lineage-build-targets"
-    lineage_build_targets.write_text(
-        '''# Ignore comments
+    lineage_build_targets.write_text(textwrap.dedent('''
+        # Ignore comments
         crosshatch userdebug lineage-18.1 W
-        ''')
+    '''))
 
     devices_json = tmp_path / "devices.json"
-    devices_json.write_text(
-        '''[
-        {  "model": "crosshatch", "oem": "Google", "name": "Pixel 3 XL", "lineage_recovery": true}
+    devices_json.write_text(textwrap.dedent('''
+        [
+            {  "model": "crosshatch", "oem": "Google", "name": "Pixel 3 XL", "lineage_recovery": true}
         ]
-        ''')
+    '''))
+
+    # nix-prefetch-git that is used underneath seems to require a real git repo
+    subprocess.check_output(["git", "init", "--initial-branch=main"], cwd=tmp_path)
+    subprocess.check_output(["git", "add", "-A"], cwd=tmp_path)
+    subprocess.check_output(["git", "commit", "-am", "Initial commit"], cwd=tmp_path)
 
     metadata = update_device_metadata.fetch_metadata(
-            f"file://{lineage_build_targets}", f"file://{devices_json}"
+        f"file://{tmp_path}",
+        "lineage-build-targets",
+        "devices.json"
     )
 
     assert metadata == {
@@ -133,6 +142,8 @@ def test_fetch_vendor_dirs(ls_remote: Any, checkout_git: Any, tmpdir: Any) -> No
             "vendor": "google"
         },
     }
-    dirs = update_device_dirs.fetch_vendor_dirs(metadata, baseurl, 'lineage-18.1')
+    dirs = update_device_dirs.fetch_vendor_dirs(
+        metadata, baseurl, 'lineage-18.1', 'lineage-18.1', {}
+    )
 
     assert 'vendor/google' in dirs

scripts/mk_repo_file.py

@@ -21,8 +21,8 @@
 
 REPO_FLAGS = [
     "--quiet",
-    "--repo-url=https://github.com/danielfullmer/tools_repo",
-    "--repo-rev=9ecb9713ee5adba95120acbc0bfef1c77b02637f",
+    "--repo-url=https://github.com/jaen/tools_repo",
+    "--repo-rev=dca531f6d6e9fdcf00aa9d18f0153bd66a2e32ea",
     "--no-repo-verify",
     "--depth=1",
 ]

scripts/robotnix_common.py

@@ -31,10 +31,10 @@ def save(filename: str, data: Any) -> None:
 
 def get_store_path(path):
     """Get actual path to a Nix store path; supports handling local remotes"""
-    prefix = os.getenv('NIX_REMOTE');
+    prefix = os.getenv('NIX_REMOTE')
     if prefix and not prefix.startswith('/'):
         raise Exception('Must be run on a local Nix store.')
-    return f"{prefix}/{path}"
+    return os.path.join(*filter(None, [prefix, path]))
 
 class GitCheckoutInfoDict(TypedDict):
     """Container for output from nix-prefetch-git"""

scripts/test_mk_repo_file.py

@@ -13,11 +13,11 @@
 import mk_repo_file
 
 
-def git_create(directory: str, tag: Optional[str] = "release") -> None:
+def git_create(directory: str, tag: Optional[str] = "release", initial_branch: str = "main") -> None:
     """Turn a directory into a git repo"""
     cwd = os.getcwd()
     os.chdir(directory)
-    subprocess.check_call(["git", "init", "--initial-branch=master"])
+    subprocess.check_call(["git", "init", f"--initial-branch={initial_branch}"])
     subprocess.check_call(["git", "config", "--local", "user.name", "testenv"])
     subprocess.check_call(["git", "config", "--local", "user.email", "testenv@example.com"])
     subprocess.check_call(["git", "add", "."])