Merge pull request #267880 from Izorkin/update-nixos-tests-logrotate (04f0aed4) · Commits · nix / nixpkgs

nixos/modules/testing/test-instrumentation.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;

+49 −41

Original line number	Diff line number	Diff line
		@@ -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 =
		''