David Heinemeier HanssonandClaude Fable 5
0c1333837f
* Move the unit tests under test/unit test/ is growing an integration suite; the fast, VM-free tests get their own directory so the two kinds cannot be confused. test/all keeps its role as the aggregate runner for everything that needs no built ISO. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Add an integration suite that boots ISO scenarios in QEMU test/integration installs an ISO once — unattended, from a generated cidata drive — and saves a reusable base image; each scenario in test/integration.d/ then boots a throwaway overlay with its own copy of the firmware vars. Shared machinery (VM lifecycle, QMP screendump + OCR console driving, virtual keystrokes, guest SSH, the cidata build) lives in base-test.sh, so a new scenario is one file. The first scenario proves omarchy-system-factory-reset hands a machine on without destroying a shared ESP: a Windows entry and a foreign Linux with its own machine-id, boot directory, and UKIs must survive both the staged reset and the first-boot provisioning that follows. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Let omarchy-iso-make keep the host package cache Purging /var/cache/pacman/pkg needs interactive sudo, which blocks unattended builds. --keep-pkg-cache skips the purge so test rigs and agents can build an ISO without a prompt. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
87 lines
3.5 KiB
Python
87 lines
3.5 KiB
Python
#!/usr/bin/python
|
|
|
|
import importlib.util
|
|
import re
|
|
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
|
|
ROOT = Path(__file__).resolve().parents[2]
|
|
MODULE_PATH = ROOT / "configs/airootfs/usr/share/omarchy-iso/orchestrator/keyboard.py"
|
|
SPEC = importlib.util.spec_from_file_location("installer_keyboard", MODULE_PATH)
|
|
KEYBOARD = importlib.util.module_from_spec(SPEC)
|
|
assert SPEC.loader
|
|
SPEC.loader.exec_module(KEYBOARD)
|
|
|
|
# The layout list lives in the Omarchy runtime now, shared verbatim with the
|
|
# first-boot owner setup; build-iso.sh vendors it onto the ISO. Read it from
|
|
# wherever this checkout can see a runtime, and skip the coverage test rather
|
|
# than fail when none is around (a bare CI checkout of just this repo).
|
|
SETUP_FORM_CANDIDATES = (
|
|
Path("/omarchy-source/install/provisioning/setup-form.sh"),
|
|
ROOT.parent / "omarchy/install/provisioning/setup-form.sh",
|
|
Path("/usr/share/omarchy/install/provisioning/setup-form.sh"),
|
|
)
|
|
|
|
|
|
def supported_keymaps():
|
|
for candidate in SETUP_FORM_CANDIDATES:
|
|
if not candidate.is_file():
|
|
continue
|
|
block = re.search(
|
|
r"OMARCHY_KEYBOARD_LAYOUTS=\$'(.*?)'\n", candidate.read_text(), re.DOTALL
|
|
)
|
|
assert block, f"no layout list in {candidate}"
|
|
return [line.split("|", 1)[1] for line in block.group(1).splitlines()]
|
|
return None
|
|
|
|
|
|
SUPPORTED_KEYMAPS = supported_keymaps()
|
|
|
|
|
|
class KeyboardConfigurationTest(unittest.TestCase):
|
|
def target(self, directory: str) -> Path:
|
|
target = Path(directory)
|
|
(target / "etc").mkdir()
|
|
(target / "etc/vconsole.conf").write_text(
|
|
"KEYMAP=us\nFONT=default8x16\n"
|
|
)
|
|
return target
|
|
|
|
def test_writes_keymap_and_xkb_settings_and_preserves_font(self):
|
|
# XKBLAYOUT is load-bearing: omarchy's detect-keyboard-layout.sh copies
|
|
# it into Hyprland's kb_layout on the installed system.
|
|
with tempfile.TemporaryDirectory() as directory:
|
|
target = self.target(directory)
|
|
self.assertTrue(KEYBOARD.configure_keyboard(target, "us"))
|
|
lines = (target / "etc/vconsole.conf").read_text().splitlines()
|
|
self.assertIn("KEYMAP=us", lines)
|
|
self.assertIn("XKBLAYOUT=us", lines)
|
|
self.assertEqual(lines.count("FONT=default8x16"), 1)
|
|
|
|
def test_all_configurator_keymaps_are_known_to_localectl(self):
|
|
if SUPPORTED_KEYMAPS is None:
|
|
self.skipTest("no Omarchy runtime checkout to read the layout list from")
|
|
for keymap in SUPPORTED_KEYMAPS:
|
|
with self.subTest(keymap=keymap), tempfile.TemporaryDirectory() as directory:
|
|
target = self.target(directory)
|
|
self.assertTrue(KEYBOARD.configure_keyboard(target, keymap))
|
|
lines = (target / "etc/vconsole.conf").read_text().splitlines()
|
|
self.assertIn(f"KEYMAP={keymap}", lines)
|
|
self.assertEqual(lines.count("FONT=default8x16"), 1)
|
|
|
|
def test_unknown_and_empty_keymaps_match_archinstall_behavior(self):
|
|
for keymap, expected in (("definitely-not-a-keymap", False), ("", True)):
|
|
with self.subTest(keymap=keymap), tempfile.TemporaryDirectory() as directory:
|
|
target = self.target(directory)
|
|
self.assertEqual(KEYBOARD.configure_keyboard(target, keymap), expected)
|
|
self.assertEqual(
|
|
(target / "etc/vconsole.conf").read_text(),
|
|
"KEYMAP=us\nFONT=default8x16\n",
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|