From 43b7a6901b52a0162c1c8ef16db70c772b9ddc51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Niemier?= <lukasz@niemier.pl>
Date: Tue, 28 Apr 2020 19:06:45 +0200
Subject: [PATCH] test: add tests for new service

---
 modules/module-list.nix      |  1 +
 modules/services/dnsmasq.nix |  2 +-
 release.nix                  |  3 ++-
 tests/services-dnsmasq.nix   | 25 +++++++++++++++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 tests/services-dnsmasq.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index cb38af0..ae5cf69 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -38,6 +38,7 @@
   ./services/autossh.nix
   ./services/buildkite-agent.nix
   ./services/chunkwm.nix
+  ./services/dnsmasq.nix
   ./services/emacs.nix
   ./services/khd
   ./services/kwm
diff --git a/modules/services/dnsmasq.nix b/modules/services/dnsmasq.nix
index c9e9f46..b7676f2 100644
--- a/modules/services/dnsmasq.nix
+++ b/modules/services/dnsmasq.nix
@@ -23,7 +23,7 @@ in
     };
 
     services.dnsmasq.bind = mkOption {
-      type = types.string;
+      type = types.str;
       default = "127.0.0.1";
       description = "This option specifies the interface on which DNSmasq will listen.";
     };
diff --git a/release.nix b/release.nix
index dd5e2b7..2771445 100644
--- a/release.nix
+++ b/release.nix
@@ -114,13 +114,14 @@ let
     tests.services-buildkite-agent = makeTest ./tests/services-buildkite-agent.nix;
     tests.services-nix-daemon = makeTest ./tests/services-nix-daemon.nix;
     tests.sockets-nix-daemon = makeTest ./tests/sockets-nix-daemon.nix;
+    tests.services-dnsmasq = makeTest ./tests/services-dnsmasq.nix;
     tests.services-nix-gc = makeTest ./tests/services-nix-gc.nix;
     tests.services-ofborg = makeTest ./tests/services-ofborg.nix;
     tests.services-offlineimap = makeTest ./tests/services-offlineimap.nix;
+    tests.services-privoxy = makeTest ./tests/services-privoxy.nix;
     tests.services-skhd = makeTest ./tests/services-skhd.nix;
     tests.services-synapse-bt = makeTest ./tests/services-synapse-bt.nix;
     tests.services-synergy = makeTest ./tests/services-synergy.nix;
-    tests.services-privoxy = makeTest ./tests/services-privoxy.nix;
     tests.system-defaults-write = makeTest ./tests/system-defaults-write.nix;
     tests.system-environment = makeTest ./tests/system-environment.nix;
     tests.system-keyboard-mapping = makeTest ./tests/system-keyboard-mapping.nix;
diff --git a/tests/services-dnsmasq.nix b/tests/services-dnsmasq.nix
new file mode 100644
index 0000000..9227e3e
--- /dev/null
+++ b/tests/services-dnsmasq.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  dnsmasq = pkgs.runCommand "dnsmasq-0.0.0" {} "mkdir $out";
+in
+
+{
+  services.dnsmasq.enable = true;
+  services.dnsmasq.package = dnsmasq;
+  services.dnsmasq.addresses = {
+    localhost = "127.0.0.1";
+  };
+
+  test = ''
+    echo >&2 "checking dnsmasq service in /Library/LaunchDaemons"
+    grep "org.nixos.dnsmasq" ${config.out}/Library/LaunchDaemons/org.nixos.dnsmasq.plist
+    grep "${dnsmasq}/bin/dnsmasq" ${config.out}/Library/LaunchDaemons/org.nixos.dnsmasq.plist
+    grep -F -- "--address=/localhost/127.0.0.1" ${config.out}/Library/LaunchDaemons/org.nixos.dnsmasq.plist
+
+    echo >&2 "checking resolver config"
+    grep -F "nameserver 127.0.0.1.53" ${config.out}/etc/resolver/localhost
+  '';
+}