From 769a073a37ebce8898fdc19a1c0ee58b104ca871 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Mar 2025 23:21:27 +0100 Subject: [PATCH] nixosTests.amazon-ssm-agent: migrate to runTest Part Of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/amazon-ssm-agent.nix | 32 ++++++++++++++------------------ 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5316fdd7cb76..f175aaa48cb1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -164,7 +164,7 @@ in { alps = runTest ./alps.nix; amazon-cloudwatch-agent = runTest ./amazon-cloudwatch-agent.nix; amazon-init-shell = runTest ./amazon-init-shell.nix; - amazon-ssm-agent = handleTest ./amazon-ssm-agent.nix {}; + amazon-ssm-agent = runTest ./amazon-ssm-agent.nix; amd-sev = runTest ./amd-sev.nix; angie-api = handleTest ./angie-api.nix {}; anki-sync-server = handleTest ./anki-sync-server.nix {}; diff --git a/nixos/tests/amazon-ssm-agent.nix b/nixos/tests/amazon-ssm-agent.nix index 4c55fc1c4faf..1c8034ff0ee4 100644 --- a/nixos/tests/amazon-ssm-agent.nix +++ b/nixos/tests/amazon-ssm-agent.nix @@ -1,22 +1,18 @@ -import ./make-test-python.nix ( - { lib, pkgs, ... }: - { - name = "amazon-ssm-agent"; - meta.maintainers = [ lib.maintainers.anthonyroussel ]; +{ lib, ... }: +{ + name = "amazon-ssm-agent"; + meta.maintainers = [ lib.maintainers.anthonyroussel ]; - nodes.machine = - { config, pkgs, ... }: - { - services.amazon-ssm-agent.enable = true; - }; + nodes.machine = { + services.amazon-ssm-agent.enable = true; + }; - testScript = '' - start_all() + testScript = '' + start_all() - machine.wait_for_file("/etc/amazon/ssm/seelog.xml") - machine.wait_for_file("/etc/amazon/ssm/amazon-ssm-agent.json") + machine.wait_for_file("/etc/amazon/ssm/seelog.xml") + machine.wait_for_file("/etc/amazon/ssm/amazon-ssm-agent.json") - machine.wait_for_unit("amazon-ssm-agent.service") - ''; - } -) + machine.wait_for_unit("amazon-ssm-agent.service") + ''; +}