From f350a6f42ced16e9c727937920dd35f076f29bc9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 1 Feb 2020 20:51:20 -0500
Subject: [PATCH 1/2] nixosTests.misc: port to python
---
nixos/tests/misc.nix | 164 ++++++++++++++++++++-----------------------
1 file changed, 76 insertions(+), 88 deletions(-)
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index ca28bc31cf1..ac26e0e4e40 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -1,6 +1,6 @@
# Miscellaneous small tests that don't warrant their own VM run.
-import ./make-test.nix ({ pkgs, ...} : rec {
+import ./make-test-python.nix ({ pkgs, ...} : rec {
name = "misc";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco ];
@@ -34,109 +34,97 @@ import ./make-test.nix ({ pkgs, ...} : rec {
testScript =
''
- subtest "nix-db", sub {
- my $json = $machine->succeed("nix path-info --json ${foo}");
- $json =~ /"narHash":"sha256:0afw0d9j1hvwiz066z93jiddc33nxg6i6qyp26vnqyglpyfivlq5"/ or die "narHash not set";
- $json =~ /"narSize":128/ or die "narSize not set";
- };
+ import json
- subtest "nixos-version", sub {
- $machine->succeed("[ `nixos-version | wc -w` = 2 ]");
- };
- subtest "nixos-rebuild", sub {
- $machine->succeed("nixos-rebuild --help | grep 'NixOS module' ");
- };
+ def get_path_info(path):
+ result = machine.succeed(f"nix path-info --json {path}")
+ parsed = json.loads(result)
+ return parsed
- # Sanity check for uid/gid assignment.
- subtest "users-groups", sub {
- $machine->succeed("[ `id -u messagebus` = 4 ]");
- $machine->succeed("[ `id -g messagebus` = 4 ]");
- $machine->succeed("[ `getent group users` = 'users:x:100:' ]");
- };
- # Regression test for GMP aborts on QEMU.
- subtest "gmp", sub {
- $machine->succeed("expr 1 + 2");
- };
+ with subtest("nix-db"):
+ info = get_path_info("${foo}")
- # Test that the swap file got created.
- subtest "swapfile", sub {
- $machine->waitForUnit("root-swapfile.swap");
- $machine->succeed("ls -l /root/swapfile | grep 134217728");
- };
+ if (
+ info[0]["narHash"]
+ != "sha256:0afw0d9j1hvwiz066z93jiddc33nxg6i6qyp26vnqyglpyfivlq5"
+ ):
+ raise Exception("narHash not set")
- # Test whether kernel.poweroff_cmd is set.
- subtest "poweroff_cmd", sub {
- $machine->succeed("[ -x \"\$(cat /proc/sys/kernel/poweroff_cmd)\" ]")
- };
+ if info[0]["narSize"] != 128:
+ raise Exception("narSize not set")
- # Test whether the blkio controller is properly enabled.
- subtest "blkio-cgroup", sub {
- $machine->succeed("[ -n \"\$(cat /sys/fs/cgroup/blkio/blkio.sectors)\" ]")
- };
+ with subtest("nixos-version"):
+ machine.succeed("[ `nixos-version | wc -w` = 2 ]")
- # Test whether we have a reboot record in wtmp.
- subtest "reboot-wtmp", sub {
- $machine->shutdown;
- $machine->waitForUnit('multi-user.target');
- $machine->succeed("last | grep reboot >&2");
- };
+ with subtest("nixos-rebuild"):
+ assert "NixOS module" in machine.succeed("nixos-rebuild --help")
- # Test whether we can override environment variables.
- subtest "override-env-var", sub {
- $machine->succeed('[ "$EDITOR" = emacs ]');
- };
+ with subtest("Sanity check for uid/gid assignment"):
+ assert "4" == machine.succeed("id -u messagebus").strip()
+ assert "4" == machine.succeed("id -g messagebus").strip()
+ assert "users:x:100:" == machine.succeed("getent group users").strip()
- # Test whether hostname (and by extension nss_myhostname) works.
- subtest "hostname", sub {
- $machine->succeed('[ "`hostname`" = machine ]');
- #$machine->succeed('[ "`hostname -s`" = machine ]');
- };
+ with subtest("Regression test for GMP aborts on QEMU."):
+ machine.succeed("expr 1 + 2")
- # Test whether systemd-udevd automatically loads modules for our hardware.
- $machine->succeed("systemctl start systemd-udev-settle.service");
- subtest "udev-auto-load", sub {
- $machine->waitForUnit('systemd-udev-settle.service');
- $machine->succeed('lsmod | grep mousedev');
- };
+ with subtest("the swap file got created"):
+ machine.wait_for_unit("root-swapfile.swap")
+ machine.succeed("ls -l /root/swapfile | grep 134217728")
- # Test whether systemd-tmpfiles-clean works.
- subtest "tmpfiles", sub {
- $machine->succeed('touch /tmp/foo');
- $machine->succeed('systemctl start systemd-tmpfiles-clean');
- $machine->succeed('[ -e /tmp/foo ]');
- $machine->succeed('date -s "@$(($(date +%s) + 1000000))"'); # move into the future
- $machine->succeed('systemctl start systemd-tmpfiles-clean');
- $machine->fail('[ -e /tmp/foo ]');
- };
+ with subtest("whether kernel.poweroff_cmd is set"):
+ machine.succeed('[ -x "$(cat /proc/sys/kernel/poweroff_cmd)" ]')
- # Test whether automounting works.
- subtest "automount", sub {
- $machine->fail("grep '/tmp2 tmpfs' /proc/mounts");
- $machine->succeed("touch /tmp2/x");
- $machine->succeed("grep '/tmp2 tmpfs' /proc/mounts");
- };
+ with subtest("whether the blkio controller is properly enabled"):
+ machine.succeed('[ -n "$(cat /sys/fs/cgroup/blkio/blkio.sectors)" ]')
- subtest "shell-vars", sub {
- $machine->succeed('[ -n "$NIX_PATH" ]');
- };
+ with subtest("whether we have a reboot record in wtmp"):
+ machine.shutdown
+ machine.wait_for_unit("multi-user.target")
+ machine.succeed("last | grep reboot >&2")
- subtest "nix-db", sub {
- $machine->succeed("nix-store -qR /run/current-system | grep nixos-");
- };
+ with subtest("whether we can override environment variables"):
+ machine.succeed('[ "$EDITOR" = emacs ]')
- # Test sysctl
- subtest "sysctl", sub {
- $machine->waitForUnit("systemd-sysctl.service");
- $machine->succeed('[ `sysctl -ne vm.swappiness` = 1 ]');
- $machine->execute('sysctl vm.swappiness=60');
- $machine->succeed('[ `sysctl -ne vm.swappiness` = 60 ]');
- };
+ with subtest("whether hostname (and by extension nss_myhostname) works"):
+ assert "machine" == machine.succeed("hostname").strip()
+ assert "machine" == machine.succeed("hostname -s").strip()
- # Test boot parameters
- subtest "bootparam", sub {
- $machine->succeed('grep -Fq vsyscall=emulate /proc/cmdline');
- };
+ with subtest("whether systemd-udevd automatically loads modules for our hardware"):
+ machine.succeed("systemctl start systemd-udev-settle.service")
+ machine.wait_for_unit("systemd-udev-settle.service")
+ assert "mousedev" in machine.succeed("lsmod")
+
+ with subtest("whether systemd-tmpfiles-clean works"):
+ machine.succeed(
+ "touch /tmp/foo", "systemctl start systemd-tmpfiles-clean", "[ -e /tmp/foo ]"
+ )
+ # move into the future
+ machine.succeed(
+ 'date -s "@$(($(date +%s) + 1000000))"',
+ "systemctl start systemd-tmpfiles-clean",
+ )
+ machine.fail("[ -e /tmp/foo ]")
+
+ with subtest("whether automounting works"):
+ machine.fail("grep '/tmp2 tmpfs' /proc/mounts")
+ machine.succeed("touch /tmp2/x")
+ machine.succeed("grep '/tmp2 tmpfs' /proc/mounts")
+
+ with subtest("shell-vars"):
+ machine.succeed('[ -n "$NIX_PATH" ]')
+
+ with subtest("nix-db"):
+ machine.succeed("nix-store -qR /run/current-system | grep nixos-")
+
+ with subtest("Test sysctl"):
+ machine.wait_for_unit("systemd-sysctl.service")
+ assert "1" == machine.succeed("sysctl -ne vm.swappiness").strip()
+ machine.execute("sysctl vm.swappiness=60")
+ assert "60" == machine.succeed("sysctl -ne vm.swappiness").strip()
+
+ with subtest("Test boot parameters"):
+ assert "vsyscall=emulate" in machine.succeed("cat /proc/cmdline")
'';
})
From 1af60850c57d7ef5fb356f257319c5a37799eab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 2 Feb 2020 13:16:30 +0100
Subject: [PATCH 2/2] 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