movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/tests/fluent-bit: migrate to runTest

Browse source
This commit is contained in:
Arian van Putten 2025-04-04 12:16:33 +01:00
parent 388a54929a
commit 145cc7ff23
2 changed files with 51 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -480,7 +480,7 @@ in
imports = [ ./firefox.nix ]; imports = [ ./firefox.nix ];
_module.args.firefoxPackage = pkgs.floorp; _module.args.firefoxPackage = pkgs.floorp;
}; };
fluent-bit = handleTest ./fluent-bit.nix { }; fluent-bit = runTest ./fluent-bit.nix;
fluentd = handleTest ./fluentd.nix { }; fluentd = handleTest ./fluentd.nix { };
fluidd = handleTest ./fluidd.nix { }; fluidd = handleTest ./fluidd.nix { };
fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix { }; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix { };

15
nixos/tests/fluent-bit.nix
View file

@ -1,11 +1,7 @@
import ./make-test-python.nix ( # Regression test for https://github.com/NixOS/nixpkgs/pull/395128
{ lib, pkgs, ... }: {
{
name = "fluent-bit"; name = "fluent-bit";
nodes.machine = {
nodes.machine =
{ config, pkgs, ... }:
{
services.fluent-bit = { services.fluent-bit = {
enable = true; enable = true;
settings = { settings = {
@ -26,7 +22,6 @@ import ./make-test-python.nix (
}; };
}; };
}; };
systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit"; systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit";
# Logs get compressed when larger than 1024 bytes # Logs get compressed when larger than 1024 bytes
@ -52,12 +47,10 @@ import ./make-test-python.nix (
machine.wait_for_unit("fluent-bit.service") machine.wait_for_unit("fluent-bit.service")
# Regression test for https://github.com/NixOS/nixpkgs/pull/395128
with subtest("fluent-bit handles zstd-compressed journal logs"): with subtest("fluent-bit handles zstd-compressed journal logs"):
machine.succeed("systemctl start fluent-bit-regression-395128.service") machine.succeed("systemctl start fluent-bit-regression-395128.service")
machine.succeed("systemctl show -p NRestarts fluent-bit.service | grep -q 'NRestarts=0'") machine.succeed("systemctl show -p NRestarts fluent-bit.service | grep -q 'NRestarts=0'")
machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out") machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out")
''; '';
} }
)