summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-02-02 13:16:30 +0100
committerVladimír Čunát <v@cunat.cz>2020-02-02 13:20:03 +0100
commit1af60850c57d7ef5fb356f257319c5a37799eab9 (patch)
treef8c5264b7d2c63852b98ec24c22ae89c75c3ae4a
parentf350a6f42ced16e9c727937920dd35f076f29bc9 (diff)
downloadnixpkgs-1af60850c57d7ef5fb356f257319c5a37799eab9.tar
nixpkgs-1af60850c57d7ef5fb356f257319c5a37799eab9.tar.gz
nixpkgs-1af60850c57d7ef5fb356f257319c5a37799eab9.tar.bz2
nixpkgs-1af60850c57d7ef5fb356f257319c5a37799eab9.tar.lz
nixpkgs-1af60850c57d7ef5fb356f257319c5a37799eab9.tar.xz
nixpkgs-1af60850c57d7ef5fb356f257319c5a37799eab9.tar.zst
nixpkgs-1af60850c57d7ef5fb356f257319c5a37799eab9.zip
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.
-rw-r--r--nixos/tests/misc.nix2
1 files changed, 1 insertions, 1 deletions
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