summaryrefslogtreecommitdiffstats
path: root/nixos/tests
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-11-09 18:02:05 +0000
committerGitHub <noreply@github.com>2021-11-09 18:02:05 +0000
commit56736d0fbc5f9e5f4e83e201dd7c856c93ec6b22 (patch)
treeabe63979645fff6d533d4e4c2baae0cb01207906 /nixos/tests
parent6ff9f5bd5d5a6ccde03b2f41273425cab3972fc8 (diff)
parent7414a16ee558f0f04700234a83c39cf7870024ff (diff)
Merge staging-next into staging
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/all-tests.nix2
-rw-r--r--nixos/tests/tinydns.nix16
2 files changed, 16 insertions, 2 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1dccf989a7ec..c86e5c6a7be1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -33,7 +33,7 @@ in
avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };
babeld = handleTest ./babeld.nix {};
bazarr = handleTest ./bazarr.nix {};
- bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64
+ bcachefs = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bcachefs.nix {};
beanstalkd = handleTest ./beanstalkd.nix {};
bees = handleTest ./bees.nix {};
bind = handleTest ./bind.nix {};
diff --git a/nixos/tests/tinydns.nix b/nixos/tests/tinydns.nix
index b80e3451700a..124508bc004b 100644
--- a/nixos/tests/tinydns.nix
+++ b/nixos/tests/tinydns.nix
@@ -21,6 +21,20 @@ import ./make-test-python.nix ({ lib, ...} : {
testScript = ''
nameserver.start()
nameserver.wait_for_unit("tinydns.service")
- nameserver.succeed("host bla.foo.bar 192.168.1.1 | grep '1\.2\.3\.4'")
+
+ # We query tinydns a few times to trigger the bug:
+ #
+ # nameserver # [ 6.105872] mmap: tinydns (842): VmData 331776 exceed data ulimit 300000. Update limits or use boot option ignore_rlimit_data.
+ #
+ # which was reported in https://github.com/NixOS/nixpkgs/issues/119066.
+ # Without the patch <nixpkgs/pkgs/tools/networking/djbdns/softlimit.patch>
+ # it fails on the 10th iteration.
+ nameserver.succeed(
+ """
+ for i in {1..100}; do
+ host bla.foo.bar 192.168.1.1 | grep '1\.2\.3\.4'
+ done
+ """
+ )
'';
})