cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #134980: nixos/test: some test fixes after #125992

Browse source
This commit is contained in:
Vladimír Čunát 2021-08-20 21:29:17 +02:00
commit 571044ad8a
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/lib/test-driver/test-driver.py
View file

@ -994,8 +994,10 @@ def _test_symbols() -> Dict[str, Any]:
subtest=subtest, subtest=subtest,
run_tests=run_tests, run_tests=run_tests,
join_all=join_all, join_all=join_all,
retry=retry,
serial_stdout_off=serial_stdout_off, serial_stdout_off=serial_stdout_off,
serial_stdout_on=serial_stdout_on, serial_stdout_on=serial_stdout_on,
Machine=Machine, # for typing
) )
return general_symbols return general_symbols

1
nixos/tests/nsd.nix
View file

@ -85,6 +85,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : {
self = clientv4 if type == 4 else clientv6 self = clientv4 if type == 4 else clientv6
out = self.succeed(f"host -{type} -t {rr} {query}").rstrip() out = self.succeed(f"host -{type} -t {rr} {query}").rstrip()
self.log(f"output: {out}") self.log(f"output: {out}")
import re
assert re.search( assert re.search(
expected, out expected, out
), f"DNS IPv{type} query on {query} gave '{out}' instead of '{expected}'" ), f"DNS IPv{type} query on {query} gave '{out}' instead of '{expected}'"