From: Luca Boccassi Date: Sun, 30 Oct 2022 11:17:13 +0000 (+0000) Subject: tests: do not hardcode x86_64 as the architecture X-Git-Tag: v15~399 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74c6bf63cd04c82a30f2ae7be9cdede76259cfc1;p=thirdparty%2Fmkosi.git tests: do not hardcode x86_64 as the architecture Otherwise tests will fail when run on other architectures. --- diff --git a/tests/test_config_parser.py b/tests/test_config_parser.py index 68a41a297..70b454755 100644 --- a/tests/test_config_parser.py +++ b/tests/test_config_parser.py @@ -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",