diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-03-02 13:42:49 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-03-02 13:42:49 +0900 |
| commit | c5089cad7883d0157ca5339ed6e43fb18ad2c838 (patch) | |
| tree | 6170e08ba1541d62b7ceee22f3c0a48ec4b0a7de /cmd/hpkg/test | |
| parent | c83905f31194541892e99d5a57b7b974b6a601d2 (diff) | |
cmd: remove hpkg
This proof-of-concept was abandoned long ago. Its test suite is flaky, heavy on I/O and does not increase test coverage. This change fully removes hpkg and supporting code.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'cmd/hpkg/test')
| -rw-r--r-- | cmd/hpkg/test/configuration.nix | 62 | ||||
| -rw-r--r-- | cmd/hpkg/test/default.nix | 34 | ||||
| -rw-r--r-- | cmd/hpkg/test/foot.nix | 48 | ||||
| -rw-r--r-- | cmd/hpkg/test/test.py | 110 |
4 files changed, 0 insertions, 254 deletions
diff --git a/cmd/hpkg/test/configuration.nix b/cmd/hpkg/test/configuration.nix deleted file mode 100644 index ce74228a..00000000 --- a/cmd/hpkg/test/configuration.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ pkgs, ... }: -{ - users.users = { - alice = { - isNormalUser = true; - description = "Alice Foobar"; - password = "foobar"; - uid = 1000; - }; - }; - - home-manager.users.alice.home.stateVersion = "24.11"; - - # Automatically login on tty1 as a normal user: - services.getty.autologinUser = "alice"; - - environment = { - variables = { - SWAYSOCK = "/tmp/sway-ipc.sock"; - WLR_RENDERER = "pixman"; - }; - }; - - # Automatically configure and start Sway when logging in on tty1: - programs.bash.loginShellInit = '' - if [ "$(tty)" = "/dev/tty1" ]; then - set -e - - mkdir -p ~/.config/sway - (sed s/Mod4/Mod1/ /etc/sway/config && - echo 'output * bg ${pkgs.nixos-artwork.wallpapers.simple-light-gray.gnomeFilePath} fill' && - echo 'output Virtual-1 res 1680x1050') > ~/.config/sway/config - - sway --validate - systemd-cat --identifier=session sway && touch /tmp/sway-exit-ok - fi - ''; - - programs.sway.enable = true; - - virtualisation = { - diskSize = 6 * 1024; - - qemu.options = [ - # Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch: - "-vga none -device virtio-gpu-pci" - - # Increase zstd performance: - "-smp 8" - ]; - }; - - environment.hakurei = { - enable = true; - stateDir = "/var/lib/hakurei"; - users.alice = 0; - - extraHomeConfig = { - home.stateVersion = "23.05"; - }; - }; -} diff --git a/cmd/hpkg/test/default.nix b/cmd/hpkg/test/default.nix deleted file mode 100644 index 85d76188..00000000 --- a/cmd/hpkg/test/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - testers, - callPackage, - - system, - self, -}: -let - buildPackage = self.buildPackage.${system}; -in -testers.nixosTest { - name = "hpkg"; - nodes.machine = { - environment.etc = { - "foot.pkg".source = callPackage ./foot.nix { inherit buildPackage; }; - }; - - imports = [ - ./configuration.nix - - self.nixosModules.hakurei - self.inputs.home-manager.nixosModules.home-manager - ]; - }; - - # adapted from nixos sway integration tests - - # testScriptWithTypes:49: error: Cannot call function of unknown type - # (machine.succeed if succeed else machine.execute)( - # ^ - # Found 1 error in 1 file (checked 1 source file) - skipTypeCheck = true; - testScript = builtins.readFile ./test.py; -} diff --git a/cmd/hpkg/test/foot.nix b/cmd/hpkg/test/foot.nix deleted file mode 100644 index 76b677ac..00000000 --- a/cmd/hpkg/test/foot.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPackage, - foot, - wayland-utils, - inconsolata, -}: - -buildPackage { - name = "foot"; - inherit (foot) version; - - identity = 2; - id = "org.codeberg.dnkl.foot"; - - modules = [ - { - home.packages = [ - foot - - # For wayland-info: - wayland-utils - ]; - } - ]; - - nixosModules = [ - { - # To help with OCR: - environment.etc."xdg/foot/foot.ini".text = lib.generators.toINI { } { - main = { - font = "inconsolata:size=14"; - }; - colors = rec { - foreground = "000000"; - background = "ffffff"; - regular2 = foreground; - }; - }; - - fonts.packages = [ inconsolata ]; - } - ]; - - script = '' - exec foot "$@" - ''; -} diff --git a/cmd/hpkg/test/test.py b/cmd/hpkg/test/test.py deleted file mode 100644 index 81e02814..00000000 --- a/cmd/hpkg/test/test.py +++ /dev/null @@ -1,110 +0,0 @@ -import json -import shlex - -q = shlex.quote -NODE_GROUPS = ["nodes", "floating_nodes"] - - -def swaymsg(command: str = "", succeed=True, type="command"): - assert command != "" or type != "command", "Must specify command or type" - shell = q(f"swaymsg -t {q(type)} -- {q(command)}") - with machine.nested( - f"sending swaymsg {shell!r}" + " (allowed to fail)" * (not succeed) - ): - ret = (machine.succeed if succeed else machine.execute)( - f"su - alice -c {shell}" - ) - - # execute also returns a status code, but disregard. - if not succeed: - _, ret = ret - - if not succeed and not ret: - return None - - parsed = json.loads(ret) - return parsed - - -def walk(tree): - yield tree - for group in NODE_GROUPS: - for node in tree.get(group, []): - yield from walk(node) - - -def wait_for_window(pattern): - def func(last_chance): - nodes = (node["name"] for node in walk(swaymsg(type="get_tree"))) - - if last_chance: - nodes = list(nodes) - machine.log(f"Last call! Current list of windows: {nodes}") - - return any(pattern in name for name in nodes) - - retry(func) - - -def collect_state_ui(name): - swaymsg(f"exec hakurei ps > '/tmp/{name}.ps'") - machine.copy_from_vm(f"/tmp/{name}.ps", "") - swaymsg(f"exec hakurei --json ps > '/tmp/{name}.json'") - machine.copy_from_vm(f"/tmp/{name}.json", "") - machine.screenshot(name) - - -def check_state(name, enablements): - instances = json.loads(machine.succeed("sudo -u alice -i XDG_RUNTIME_DIR=/run/user/1000 hakurei --json ps")) - if len(instances) != 1: - raise Exception(f"unexpected state length {len(instances)}") - instance = instances[0] - - if len(instance['container']['args']) != 1 or not (instance['container']['args'][0].startswith("/nix/store/")) or f"hakurei-{name}-" not in (instance['container']['args'][0]): - raise Exception(f"unexpected args {instance['container']['args']}") - - if instance['enablements'] != enablements: - raise Exception(f"unexpected enablements {instance['enablements']}") - - -start_all() -machine.wait_for_unit("multi-user.target") - -# To check hakurei's version: -print(machine.succeed("sudo -u alice -i hakurei version")) - -# Wait for Sway to complete startup: -machine.wait_for_file("/run/user/1000/wayland-1") -machine.wait_for_file("/tmp/sway-ipc.sock") - -# Prepare hpkg directory: -machine.succeed("install -dm 0700 -o alice -g users /var/lib/hakurei/1000") - -# Install hpkg app: -swaymsg("exec hpkg -v install /etc/foot.pkg && touch /tmp/hpkg-install-ok") -machine.wait_for_file("/tmp/hpkg-install-ok") - -# Start app (foot) with Wayland enablement: -swaymsg("exec hpkg -v start org.codeberg.dnkl.foot") -wait_for_window("hakurei@machine-foot") -machine.send_chars("clear; wayland-info && touch /tmp/success-client\n") -machine.wait_for_file("/tmp/hakurei.0/tmpdir/2/success-client") -collect_state_ui("app_wayland") -check_state("foot", {"wayland": True, "dbus": True, "pipewire": True}) -# Verify acl on XDG_RUNTIME_DIR: -print(machine.succeed("getfacl --absolute-names --omit-header --numeric /tmp/hakurei.0/runtime | grep 10002")) -machine.send_chars("exit\n") -machine.wait_until_fails("pgrep foot") -# Verify acl cleanup on XDG_RUNTIME_DIR: -machine.wait_until_fails("getfacl --absolute-names --omit-header --numeric /tmp/hakurei.0/runtime | grep 10002") - -# Exit Sway and verify process exit status 0: -swaymsg("exit", succeed=False) -machine.wait_for_file("/tmp/sway-exit-ok") - -# Print hakurei share and rundir contents: -print(machine.succeed("find /tmp/hakurei.0 " - + "-path '/tmp/hakurei.0/runtime/*/*' -prune -o " - + "-path '/tmp/hakurei.0/tmpdir/*/*' -prune -o " - + "-print")) -print(machine.fail("ls /run/user/1000/hakurei")) |
