From 1af60850c57d7ef5fb356f257319c5a37799eab9 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 2 Feb 2020 13:16:30 +0100 Subject: nixosTests.misc: fix blkio sub-test with newer kernels The blkio.sectors file is no longer provided; by quick search: https://issues.apache.org/jira/browse/MESOS-9848 so hopefully it's sufficient to test existence of this other file: https://www.kernel.org/doc/html/v5.4/admin-guide/cgroup-v1/blkio-controller.html#common-files-among-various-policies Originally this sub-test was added in 58e40f84. --- nixos/tests/misc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index ac26e0e4e40..17260ce6406 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -77,7 +77,7 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { machine.succeed('[ -x "$(cat /proc/sys/kernel/poweroff_cmd)" ]') with subtest("whether the blkio controller is properly enabled"): - machine.succeed('[ -n "$(cat /sys/fs/cgroup/blkio/blkio.sectors)" ]') + machine.succeed("[ -e /sys/fs/cgroup/blkio/blkio.reset_stats ]") with subtest("whether we have a reboot record in wtmp"): machine.shutdown -- cgit 1.4.1