cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #267880 from Izorkin/update-nixos-tests-logrotate

Browse source
This commit is contained in:
Franz Pletz 2024-05-10 02:06:59 +02:00 committed by GitHub
commit 04f0aed442
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 51 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/testing/test-instrumentation.nix
View file

@ -218,6 +218,8 @@ in
services.displayManager.logToJournal = true;
services.logrotate.enable = lib.mkDefault false;
# Make sure we use the Guest Agent from the QEMU package for testing
# to reduce the closure size required for the tests.
services.qemuGuest.package = pkgs.qemu_test.ga;

14
nixos/tests/logrotate.nix
View file

@ -16,17 +16,24 @@ import ./make-test-python.nix ({ pkgs, ... }: rec {
};
nodes = {
defaultMachine = { ... }: { };
defaultMachine = { ... }: {
services.logrotate.enable = true;
};
failingMachine = { ... }: {
services.logrotate.configFile = pkgs.writeText "logrotate.conf" ''
services.logrotate = {
enable = true;
configFile = pkgs.writeText "logrotate.conf" ''
# self-written config file
su notarealuser notagroupeither
'';
};
};
machine = { config, ... }: {
imports = [ importTest ];
services.logrotate.settings = {
services.logrotate = {
enable = true;
settings = {
# remove default frequency header and add another
header = {
frequency = null;
@ -66,6 +73,7 @@ import ./make-test-python.nix ({ pkgs, ... }: rec {
};
};
};
};
testScript =
''