diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2017-09-16 11:47:21 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-09-16 12:45:23 +0200 |
| commit | c85cf60c833b99bc3b84aa0f5f2d20c5d6a39cc3 (patch) | |
| tree | 1f50bd990e065467346b6f21950a1391c88f05e5 /nixos | |
| parent | f351ee7e9b1987a858608e9480052ab29703b0b8 (diff) | |
| download | nixlib-c85cf60c833b99bc3b84aa0f5f2d20c5d6a39cc3.tar nixlib-c85cf60c833b99bc3b84aa0f5f2d20c5d6a39cc3.tar.gz nixlib-c85cf60c833b99bc3b84aa0f5f2d20c5d6a39cc3.tar.bz2 nixlib-c85cf60c833b99bc3b84aa0f5f2d20c5d6a39cc3.tar.lz nixlib-c85cf60c833b99bc3b84aa0f5f2d20c5d6a39cc3.tar.xz nixlib-c85cf60c833b99bc3b84aa0f5f2d20c5d6a39cc3.tar.zst nixlib-c85cf60c833b99bc3b84aa0f5f2d20c5d6a39cc3.zip | |
nixos/tests: move sysctl test to misc
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/release-combined.nix | 1 | ||||
| -rw-r--r-- | nixos/release.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/misc.nix | 9 | ||||
| -rw-r--r-- | nixos/tests/sysctl.nix | 25 |
4 files changed, 9 insertions, 27 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index a7ceb104b577..f5b988501f91 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -119,7 +119,6 @@ in rec { (all nixos.tests.sddm.default) (all nixos.tests.simple) (all nixos.tests.slim) - nixos.tests.sysctl.x86_64-linux # i686 fails (all nixos.tests.udisks2) (all nixos.tests.xfce) diff --git a/nixos/release.nix b/nixos/release.nix index 38c446c1f8a4..4eeefad9cab6 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -313,7 +313,6 @@ in rec { tests.slim = callTest tests/slim.nix {}; tests.smokeping = callTest tests/smokeping.nix {}; tests.snapper = callTest tests/snapper.nix {}; - tests.sysctl = callTest tests/sysctl.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 1b24551009c9..222b60ab24aa 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -25,6 +25,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; users.users.sybil = { isNormalUser = true; group = "wheel"; }; security.sudo = { enable = true; wheelNeedsPassword = false; }; + boot.kernel.sysctl."vm.swappiness" = 1; }; testScript = @@ -117,5 +118,13 @@ import ./make-test.nix ({ pkgs, ...} : { subtest "sudo", sub { $machine->succeed("su - sybil -c 'sudo true'"); }; + + # 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 ]'); + }; ''; }) diff --git a/nixos/tests/sysctl.nix b/nixos/tests/sysctl.nix deleted file mode 100644 index d7220cabb22c..000000000000 --- a/nixos/tests/sysctl.nix +++ /dev/null @@ -1,25 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "sysctl"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - machine = { config, lib, pkgs, ... }: - { - boot.kernelPackages = pkgs.linuxPackages; - boot.kernel.sysctl = { - "kernel.dmesg_restrict" = true; # Restrict dmesg access - "net.core.bpf_jit_enable" = false; # Turn off bpf JIT - "user.max_user_namespaces" = 0; # Disable user namespaces - "vm.swappiness" = 2; # Low swap usage - }; - }; - - testScript = - '' - $machine->succeed("sysctl kernel.dmesg_restrict | grep 'kernel.dmesg_restrict = 1'"); - $machine->succeed("sysctl net.core.bpf_jit_enable | grep 'net.core.bpf_jit_enable = 0'"); - $machine->succeed("sysctl user.max_user_namespaces | grep 'user.max_user_namespaces = 0'"); - $machine->succeed("sysctl vm.swappiness | grep 'vm.swappiness = 2'"); - ''; -}) |