JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixosTests.dnscrypt-proxy2: init

Browse Source 
This removes the old dnscrypt-proxy test.
This commit is contained in:
worldofpeace 2020-02-01 18:59:02 -05:00
parent 915060d03f
commit 4c3166b006
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -65,7 +65,7 @@ in
couchdb = handleTest ./couchdb.nix {}; couchdb = handleTest ./couchdb.nix {};
deluge = handleTest ./deluge.nix {}; deluge = handleTest ./deluge.nix {};
dhparams = handleTest ./dhparams.nix {}; dhparams = handleTest ./dhparams.nix {};
dnscrypt-proxy = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {};
docker = handleTestOn ["x86_64-linux"] ./docker.nix {}; docker = handleTestOn ["x86_64-linux"] ./docker.nix {};
docker-containers = handleTestOn ["x86_64-linux"] ./docker-containers.nix {}; docker-containers = handleTestOn ["x86_64-linux"] ./docker-containers.nix {};
docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {}; docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {};

23
nixos/tests/dnscrypt-proxy.nix → nixos/tests/dnscrypt-proxy2.nix
View File

@ -1,5 +1,5 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "dnscrypt-proxy"; name = "dnscrypt-proxy2";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ joachifm ]; maintainers = [ joachifm ];
}; };
@ -13,9 +13,16 @@ import ./make-test-python.nix ({ pkgs, ... }: {
{ {
security.apparmor.enable = true; security.apparmor.enable = true;
services.dnscrypt-proxy.enable = true; services.dnscrypt-proxy2.enable = true;
services.dnscrypt-proxy.localPort = localProxyPort; services.dnscrypt-proxy2.settings = {
services.dnscrypt-proxy.extraArgs = [ "-X libdcplugin_example.so" ]; listen_addresses = [ "127.0.0.1:${toString localProxyPort}" ];
sources.public-resolvers = {
urls = [ "https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md" ];
cache_file = "public-resolvers.md";
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
refresh_delay = 72;
};
};
services.dnsmasq.enable = true; services.dnsmasq.enable = true;
services.dnsmasq.servers = [ "127.0.0.1#${toString localProxyPort}" ]; services.dnsmasq.servers = [ "127.0.0.1#${toString localProxyPort}" ];
@ -24,12 +31,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = '' testScript = ''
client.wait_for_unit("dnsmasq") client.wait_for_unit("dnsmasq")
client.wait_for_unit("dnscrypt-proxy2")
# The daemon is socket activated; sending a single ping should activate it.
client.fail("systemctl is-active dnscrypt-proxy")
client.execute(
"${pkgs.iputils}/bin/ping -c1 example.com"
)
client.wait_until_succeeds("systemctl is-active dnscrypt-proxy")
''; '';
}) })