diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-09 21:53:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-09 21:53:07 +0000 |
| commit | 488e6b7a239812bf5243acf7a3f3f0054229aeab (patch) | |
| tree | 55a8f851a404f668ed9b724c5f0a12f16c7bbd95 | |
| parent | 05cd6911732164ae23279030e8c15803852f7e91 (diff) | |
| parent | caac0964bbd85aad3d244ec414a41cc1cd9eaeb2 (diff) | |
| download | nixlib-488e6b7a239812bf5243acf7a3f3f0054229aeab.tar nixlib-488e6b7a239812bf5243acf7a3f3f0054229aeab.tar.gz nixlib-488e6b7a239812bf5243acf7a3f3f0054229aeab.tar.bz2 nixlib-488e6b7a239812bf5243acf7a3f3f0054229aeab.tar.lz nixlib-488e6b7a239812bf5243acf7a3f3f0054229aeab.tar.xz nixlib-488e6b7a239812bf5243acf7a3f3f0054229aeab.tar.zst nixlib-488e6b7a239812bf5243acf7a3f3f0054229aeab.zip | |
Merge pull request #73059 from flokli/nixos-test-port-tinydns
nixos/tinydns: port test to python
| -rw-r--r-- | nixos/modules/services/networking/tinydns.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/tinydns.nix | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix index 7b2c464ab46b..79507b2ebcdd 100644 --- a/nixos/modules/services/networking/tinydns.nix +++ b/nixos/modules/services/networking/tinydns.nix @@ -37,6 +37,7 @@ with lib; systemd.services.tinydns = { description = "djbdns tinydns server"; wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; path = with pkgs; [ daemontools djbdns ]; preStart = '' rm -rf /var/lib/tinydns diff --git a/nixos/tests/tinydns.nix b/nixos/tests/tinydns.nix index cb7ee0c5fb5e..c7740d5ade35 100644 --- a/nixos/tests/tinydns.nix +++ b/nixos/tests/tinydns.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ lib, ...} : { +import ./make-test-python.nix ({ lib, ...} : { name = "tinydns"; meta = { maintainers = with lib.maintainers; [ basvandijk ]; @@ -19,8 +19,8 @@ import ./make-test.nix ({ lib, ...} : { }; }; testScript = '' - $nameserver->start; - $nameserver->waitForUnit("tinydns.service"); - $nameserver->succeed("host bla.foo.bar | grep '1\.2\.3\.4'"); + nameserver.start() + nameserver.wait_for_unit("tinydns.service") + nameserver.succeed("host bla.foo.bar | grep '1\.2\.3\.4'") ''; }) |