diff options
| author | David Arnold <dgx.arnold@gmail.com> | 2021-08-20 12:58:49 -0500 |
|---|---|---|
| committer | David Arnold <dgx.arnold@gmail.com> | 2021-08-20 13:38:22 -0500 |
| commit | 2832896c5b9a22a7fba0e4fb894c44d04e4ed89f (patch) | |
| tree | 39d03818b92c632d2b580a4e5c94cb1f1bfedfbc | |
| parent | 3efbe3863aba9bbb49d1f0163d2665b44c125a01 (diff) | |
| download | nixpkgs-2832896c5b9a22a7fba0e4fb894c44d04e4ed89f.tar nixpkgs-2832896c5b9a22a7fba0e4fb894c44d04e4ed89f.tar.gz nixpkgs-2832896c5b9a22a7fba0e4fb894c44d04e4ed89f.tar.bz2 nixpkgs-2832896c5b9a22a7fba0e4fb894c44d04e4ed89f.tar.lz nixpkgs-2832896c5b9a22a7fba0e4fb894c44d04e4ed89f.tar.xz nixpkgs-2832896c5b9a22a7fba0e4fb894c44d04e4ed89f.tar.zst nixpkgs-2832896c5b9a22a7fba0e4fb894c44d04e4ed89f.zip | |
nixos/test: some test fixes in succession of #125992
| -rwxr-xr-x | nixos/lib/test-driver/test-driver.py | 2 | ||||
| -rw-r--r-- | nixos/tests/nsd.nix | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 488789e119d..f8502188bde 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -994,8 +994,10 @@ def _test_symbols() -> Dict[str, Any]: subtest=subtest, run_tests=run_tests, join_all=join_all, + retry=retry, serial_stdout_off=serial_stdout_off, serial_stdout_on=serial_stdout_on, + Machine=Machine, # for typing ) return general_symbols diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix index 7387f4f1dfa..eea5a82f6f9 100644 --- a/nixos/tests/nsd.nix +++ b/nixos/tests/nsd.nix @@ -85,6 +85,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { self = clientv4 if type == 4 else clientv6 out = self.succeed(f"host -{type} -t {rr} {query}").rstrip() self.log(f"output: {out}") + import re assert re.search( expected, out ), f"DNS IPv{type} query on {query} gave '{out}' instead of '{expected}'" |