diff options
| author | Adam Stephens <adam@valkor.net> | 2023-10-27 18:05:58 -0400 |
|---|---|---|
| committer | Adam Stephens <adam@valkor.net> | 2023-11-02 19:54:04 -0400 |
| commit | 3087595a6bead1d30cab95a886ef0eba99fa5dae (patch) | |
| tree | 8e9ec0f2c2d9b4cf2a0b4a9660b19323e333f20d /nixos/tests | |
| parent | 1fff6a90316002764fee541e9ffa1bc7a9552521 (diff) | |
| download | nixlib-3087595a6bead1d30cab95a886ef0eba99fa5dae.tar nixlib-3087595a6bead1d30cab95a886ef0eba99fa5dae.tar.gz nixlib-3087595a6bead1d30cab95a886ef0eba99fa5dae.tar.bz2 nixlib-3087595a6bead1d30cab95a886ef0eba99fa5dae.tar.lz nixlib-3087595a6bead1d30cab95a886ef0eba99fa5dae.tar.xz nixlib-3087595a6bead1d30cab95a886ef0eba99fa5dae.tar.zst nixlib-3087595a6bead1d30cab95a886ef0eba99fa5dae.zip | |
nixos/incus: preseed should not trigger socket-activation
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/incus/preseed.nix | 7 | ||||
| -rw-r--r-- | nixos/tests/incus/socket-activated.nix | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/nixos/tests/incus/preseed.nix b/nixos/tests/incus/preseed.nix index 19ec3889093c..47b2d0cd6228 100644 --- a/nixos/tests/incus/preseed.nix +++ b/nixos/tests/incus/preseed.nix @@ -49,13 +49,8 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : }; testScript = '' - def wait_for_preseed(_) -> bool: - _, output = machine.systemctl("is-active incus-preseed.service") - return ("inactive" in output) - machine.wait_for_unit("incus.service") - with machine.nested("Waiting for preseed to complete"): - retry(wait_for_preseed) + machine.wait_for_unit("incus-preseed.service") with subtest("Verify preseed resources created"): machine.succeed("incus profile show nixostest_default") diff --git a/nixos/tests/incus/socket-activated.nix b/nixos/tests/incus/socket-activated.nix index e48831cd3cb3..4d25b26a15f5 100644 --- a/nixos/tests/incus/socket-activated.nix +++ b/nixos/tests/incus/socket-activated.nix @@ -17,6 +17,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : # ensure service is not running by default machine.fail("systemctl is-active incus.service") + machine.fail("systemctl is-active incus-preseed.service") # access the socket and ensure the service starts machine.succeed("incus list") |