nixosTests.allTerminfo: migrate to runTest

Part Of #386873

Changed files
+44 -46
nixos
+43 -45
nixos/tests/all-terminfo.nix
···
-
import ./make-test-python.nix (
-
{ pkgs, ... }:
-
rec {
-
name = "all-terminfo";
-
meta = with pkgs.lib.maintainers; {
-
maintainers = [ jkarlson ];
-
};
+
{ pkgs, ... }:
+
{
+
name = "all-terminfo";
+
meta = with pkgs.lib.maintainers; {
+
maintainers = [ jkarlson ];
+
};
-
nodes.machine =
-
{
-
pkgs,
-
config,
-
lib,
-
...
-
}:
-
let
-
infoFilter =
-
name: drv:
-
let
-
o = builtins.tryEval drv;
-
in
-
o.success
-
&& lib.isDerivation o.value
-
&& o.value ? outputs
-
&& builtins.elem "terminfo" o.value.outputs
-
&& !o.value.meta.broken;
-
terminfos = lib.filterAttrs infoFilter pkgs;
-
excludedTerminfos = lib.filterAttrs (
-
_: drv: !(builtins.elem drv.terminfo config.environment.systemPackages)
-
) terminfos;
-
includedOuts = lib.filterAttrs (
-
_: drv: builtins.elem drv.out config.environment.systemPackages
-
) terminfos;
-
in
-
{
-
environment = {
-
enableAllTerminfo = true;
-
etc."terminfo-missing".text = builtins.concatStringsSep "\n" (builtins.attrNames excludedTerminfos);
-
etc."terminfo-extra-outs".text = builtins.concatStringsSep "\n" (builtins.attrNames includedOuts);
-
};
+
nodes.machine =
+
{
+
pkgs,
+
config,
+
lib,
+
...
+
}:
+
let
+
infoFilter =
+
name: drv:
+
let
+
o = builtins.tryEval drv;
+
in
+
o.success
+
&& lib.isDerivation o.value
+
&& o.value ? outputs
+
&& builtins.elem "terminfo" o.value.outputs
+
&& !o.value.meta.broken;
+
terminfos = lib.filterAttrs infoFilter pkgs;
+
excludedTerminfos = lib.filterAttrs (
+
_: drv: !(builtins.elem drv.terminfo config.environment.systemPackages)
+
) terminfos;
+
includedOuts = lib.filterAttrs (
+
_: drv: builtins.elem drv.out config.environment.systemPackages
+
) terminfos;
+
in
+
{
+
environment = {
+
enableAllTerminfo = true;
+
etc."terminfo-missing".text = builtins.concatStringsSep "\n" (builtins.attrNames excludedTerminfos);
+
etc."terminfo-extra-outs".text = builtins.concatStringsSep "\n" (builtins.attrNames includedOuts);
};
+
};
-
testScript = ''
-
machine.fail("grep . /etc/terminfo-missing >&2")
-
machine.fail("grep . /etc/terminfo-extra-outs >&2")
-
'';
-
}
-
)
+
testScript = ''
+
machine.fail("grep . /etc/terminfo-missing >&2")
+
machine.fail("grep . /etc/terminfo-extra-outs >&2")
+
'';
+
}
+1 -1
nixos/tests/all-tests.nix
···
akkoma-confined = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./akkoma.nix { confined = true; };
alice-lg = runTest ./alice-lg.nix;
alloy = runTest ./alloy.nix;
-
allTerminfo = handleTest ./all-terminfo.nix {};
+
allTerminfo = runTest ./all-terminfo.nix;
alps = handleTest ./alps.nix {};
amazon-cloudwatch-agent = handleTest ./amazon-cloudwatch-agent.nix {};
amazon-init-shell = handleTest ./amazon-init-shell.nix {};