nixosTests.atop: migrate to runTest

Part of #386873
This commit is contained in:
Piotr Kwiecinski 2025-04-05 18:56:33 +02:00
parent cde4eab056
commit 9cb379134c
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 10 additions and 13 deletions

View file

@ -208,7 +208,7 @@ in
armagetronad = runTest ./armagetronad.nix; armagetronad = runTest ./armagetronad.nix;
artalk = runTest ./artalk.nix; artalk = runTest ./artalk.nix;
atd = runTest ./atd.nix; atd = runTest ./atd.nix;
atop = handleTest ./atop.nix { }; atop = import ./atop.nix { inherit pkgs runTest; };
atticd = runTest ./atticd.nix; atticd = runTest ./atticd.nix;
atuin = runTest ./atuin.nix; atuin = runTest ./atuin.nix;
audiobookshelf = runTest ./audiobookshelf.nix; audiobookshelf = runTest ./audiobookshelf.nix;

View file

@ -1,12 +1,9 @@
{ {
system ? builtins.currentSystem, pkgs,
config ? { }, runTest,
pkgs ? import ../.. { inherit system config; }, ...
}: }:
with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let let
assertions = rec { assertions = rec {
path = program: path: '' path = program: path: ''
@ -129,7 +126,7 @@ let
}; };
in in
{ {
justThePackage = makeTest { justThePackage = runTest {
name = "atop-justThePackage"; name = "atop-justThePackage";
nodes.machine = { nodes.machine = {
environment.systemPackages = [ pkgs.atop ]; environment.systemPackages = [ pkgs.atop ];
@ -148,7 +145,7 @@ in
]; ];
inherit meta; inherit meta;
}; };
defaults = makeTest { defaults = runTest {
name = "atop-defaults"; name = "atop-defaults";
nodes.machine = { nodes.machine = {
programs.atop = { programs.atop = {
@ -169,7 +166,7 @@ in
]; ];
inherit meta; inherit meta;
}; };
minimal = makeTest { minimal = runTest {
name = "atop-minimal"; name = "atop-minimal";
nodes.machine = { nodes.machine = {
programs.atop = { programs.atop = {
@ -193,7 +190,7 @@ in
]; ];
inherit meta; inherit meta;
}; };
netatop = makeTest { netatop = runTest {
name = "atop-netatop"; name = "atop-netatop";
nodes.machine = { nodes.machine = {
programs.atop = { programs.atop = {
@ -215,7 +212,7 @@ in
]; ];
inherit meta; inherit meta;
}; };
atopgpu = makeTest { atopgpu = runTest {
name = "atop-atopgpu"; name = "atop-atopgpu";
nodes.machine = { nodes.machine = {
programs.atop = { programs.atop = {
@ -237,7 +234,7 @@ in
]; ];
inherit meta; inherit meta;
}; };
everything = makeTest { everything = runTest {
name = "atop-everything"; name = "atop-everything";
nodes.machine = { nodes.machine = {
programs.atop = { programs.atop = {