Skip to content

Commit 4cbd621

Browse files
authored
nixosTests.atop: migrate to runTest (NixOS#396382)
2 parents a1599a0 + 9cb3791 commit 4cbd621

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

nixos/tests/all-tests.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ in
208208
armagetronad = runTest ./armagetronad.nix;
209209
artalk = runTest ./artalk.nix;
210210
atd = runTest ./atd.nix;
211-
atop = handleTest ./atop.nix { };
211+
atop = import ./atop.nix { inherit pkgs runTest; };
212212
atticd = runTest ./atticd.nix;
213213
atuin = runTest ./atuin.nix;
214214
audiobookshelf = runTest ./audiobookshelf.nix;

nixos/tests/atop.nix

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
{
2-
system ? builtins.currentSystem,
3-
config ? { },
4-
pkgs ? import ../.. { inherit system config; },
2+
pkgs,
3+
runTest,
4+
...
55
}:
66

7-
with import ../lib/testing-python.nix { inherit system pkgs; };
8-
with pkgs.lib;
9-
107
let
118
assertions = rec {
129
path = program: path: ''
@@ -129,7 +126,7 @@ let
129126
};
130127
in
131128
{
132-
justThePackage = makeTest {
129+
justThePackage = runTest {
133130
name = "atop-justThePackage";
134131
nodes.machine = {
135132
environment.systemPackages = [ pkgs.atop ];
@@ -148,7 +145,7 @@ in
148145
];
149146
inherit meta;
150147
};
151-
defaults = makeTest {
148+
defaults = runTest {
152149
name = "atop-defaults";
153150
nodes.machine = {
154151
programs.atop = {
@@ -169,7 +166,7 @@ in
169166
];
170167
inherit meta;
171168
};
172-
minimal = makeTest {
169+
minimal = runTest {
173170
name = "atop-minimal";
174171
nodes.machine = {
175172
programs.atop = {
@@ -193,7 +190,7 @@ in
193190
];
194191
inherit meta;
195192
};
196-
netatop = makeTest {
193+
netatop = runTest {
197194
name = "atop-netatop";
198195
nodes.machine = {
199196
programs.atop = {
@@ -215,7 +212,7 @@ in
215212
];
216213
inherit meta;
217214
};
218-
atopgpu = makeTest {
215+
atopgpu = runTest {
219216
name = "atop-atopgpu";
220217
nodes.machine = {
221218
programs.atop = {
@@ -237,7 +234,7 @@ in
237234
];
238235
inherit meta;
239236
};
240-
everything = makeTest {
237+
everything = runTest {
241238
name = "atop-everything";
242239
nodes.machine = {
243240
programs.atop = {

0 commit comments

Comments
 (0)