]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
tests: do not hardcode x86_64 as the architecture
authorLuca Boccassi <bluca@debian.org>
Sun, 30 Oct 2022 11:17:13 +0000 (11:17 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Sun, 30 Oct 2022 12:07:02 +0000 (13:07 +0100)
Otherwise tests will fail when run on other architectures.

tests/test_config_parser.py

index 68a41a297223bcca80a4364b5f7da2a4556d7a70..70b4547556447a3464b67964396f76e69de5a6a0 100644 (file)
@@ -5,6 +5,7 @@ import contextlib
 import copy
 import importlib
 import os
+import platform
 import shutil
 from pathlib import Path
 from typing import Any, Dict, Generator, List, Mapping, Optional
@@ -54,7 +55,7 @@ class MkosiConfig:
         self.reference_config[job_name] = {
             "all": False,
             "all_directory": None,
-            "architecture": "x86_64",
+            "architecture": platform.machine(),
             "bmap": False,
             "boot_protocols": None,
             "bootable": False,
@@ -626,7 +627,7 @@ class MkosiConfigManyParams(MkosiConfigOne):
                 "Repositories": "http://ubuntu/repos",
                 "UseHostRepositories": False,
                 "Mirror": "http://ubuntu/mirror",
-                "Architecture": "x86_64",
+                "Architecture": platform.machine(),
             },
             "Output": {
                 "Format": "gpt_btrfs",
@@ -692,7 +693,7 @@ class MkosiConfigManyParams(MkosiConfigOne):
                 "Repositories": "http://debian/repos",
                 "UseHostRepositories": False,
                 "Mirror": "http://ubuntu/mirror",
-                "Architecture": "x86_64",
+                "Architecture": platform.machine(),
             },
             "Output": {
                 "Format": "gpt_btrfs",