nixosTests.archi: migrate to runTest

Part Of #386873
This commit is contained in:
Martin Weinelt 2025-03-13 23:35:22 +01:00
parent 653313abe1
commit f13c50690f
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 29 additions and 31 deletions

View file

@ -174,7 +174,7 @@ in {
appliance-repart-image = runTest ./appliance-repart-image.nix; appliance-repart-image = runTest ./appliance-repart-image.nix;
appliance-repart-image-verity-store = runTest ./appliance-repart-image-verity-store.nix; appliance-repart-image-verity-store = runTest ./appliance-repart-image-verity-store.nix;
apparmor = runTest ./apparmor; apparmor = runTest ./apparmor;
archi = handleTest ./archi.nix {}; archi = runTest ./archi.nix;
aria2 = handleTest ./aria2.nix {}; aria2 = handleTest ./aria2.nix {};
armagetronad = handleTest ./armagetronad.nix {}; armagetronad = handleTest ./armagetronad.nix {};
artalk = runTest ./artalk.nix; artalk = runTest ./artalk.nix;

View file

@ -1,38 +1,36 @@
import ./make-test-python.nix ( { lib, ... }:
{ lib, ... }: {
{ name = "archi";
name = "archi"; meta.maintainers = with lib.maintainers; [ paumr ];
meta.maintainers = with lib.maintainers; [ paumr ];
nodes.machine = nodes.machine =
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./common/x11.nix ./common/x11.nix
]; ];
environment.systemPackages = with pkgs; [ archi ]; environment.systemPackages = with pkgs; [ archi ];
}; };
enableOCR = true; enableOCR = true;
testScript = '' testScript = ''
machine.wait_for_x() machine.wait_for_x()
with subtest("createEmptyModel via CLI"): with subtest("createEmptyModel via CLI"):
machine.succeed("Archi -application com.archimatetool.commandline.app -consoleLog -nosplash --createEmptyModel --saveModel smoke.archimate") machine.succeed("Archi -application com.archimatetool.commandline.app -consoleLog -nosplash --createEmptyModel --saveModel smoke.archimate")
machine.copy_from_vm("smoke.archimate", "") machine.copy_from_vm("smoke.archimate", "")
with subtest("UI smoketest"): with subtest("UI smoketest"):
machine.succeed("DISPLAY=:0 Archi --createEmptyModel >&2 &") machine.succeed("DISPLAY=:0 Archi --createEmptyModel >&2 &")
machine.wait_for_window("Archi") machine.wait_for_window("Archi")
# wait till main UI is open # wait till main UI is open
# since OCR seems to be buggy wait_for_text was replaced by sleep, issue: #302965 # since OCR seems to be buggy wait_for_text was replaced by sleep, issue: #302965
# machine.wait_for_text("Welcome to Archi") # machine.wait_for_text("Welcome to Archi")
machine.sleep(20) machine.sleep(20)
machine.screenshot("welcome-screen") machine.screenshot("welcome-screen")
''; '';
} }
)