summary refs log tree commit diff
path: root/nixos/tests/txredisapi.nix
diff options
context:
space:
mode:
authorJulien Moutinho <julm+nixpkgs@sourcephile.fr>2021-10-23 05:44:07 +0200
committertomberek <tomberek@users.noreply.github.com>2021-12-13 14:42:19 -0500
commit5cf90a60e5ddf68fbfc04d643970136bf00ba315 (patch)
tree537ae30a11cd923d8c13cb53e8aa505c14cfb83b /nixos/tests/txredisapi.nix
parent747555437232a73184e8eab6daae368047042709 (diff)
downloadnixpkgs-5cf90a60e5ddf68fbfc04d643970136bf00ba315.tar
nixpkgs-5cf90a60e5ddf68fbfc04d643970136bf00ba315.tar.gz
nixpkgs-5cf90a60e5ddf68fbfc04d643970136bf00ba315.tar.bz2
nixpkgs-5cf90a60e5ddf68fbfc04d643970136bf00ba315.tar.lz
nixpkgs-5cf90a60e5ddf68fbfc04d643970136bf00ba315.tar.xz
nixpkgs-5cf90a60e5ddf68fbfc04d643970136bf00ba315.tar.zst
nixpkgs-5cf90a60e5ddf68fbfc04d643970136bf00ba315.zip
nixos/redis: cleanup tests
Diffstat (limited to 'nixos/tests/txredisapi.nix')
-rw-r--r--nixos/tests/txredisapi.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/nixos/tests/txredisapi.nix b/nixos/tests/txredisapi.nix
index bc3814a7137..7c6b36a5c47 100644
--- a/nixos/tests/txredisapi.nix
+++ b/nixos/tests/txredisapi.nix
@@ -10,17 +10,19 @@ import ./make-test-python.nix ({ pkgs, ... }:
       { pkgs, ... }:
 
       {
-        services.redis.enable = true;
-        services.redis.unixSocket = "/run/redis/redis.sock";
+        services.redis.servers."".enable = true;
 
         environment.systemPackages = with pkgs; [ (python38.withPackages (ps: [ ps.twisted ps.txredisapi ps.mock ]))];
       };
   };
 
-  testScript = ''
+  testScript = { nodes, ... }: let
+    inherit (nodes.machine.config.services) redis;
+    in ''
     start_all()
     machine.wait_for_unit("redis")
-    machine.wait_for_open_port("6379")
+    machine.wait_for_file("${redis.servers."".unixSocket}")
+    machine.succeed("ln -s ${redis.servers."".unixSocket} /tmp/redis.sock")
 
     tests = machine.succeed("PYTHONPATH=\"${pkgs.python3Packages.txredisapi.src}\" python -m twisted.trial ${pkgs.python3Packages.txredisapi.src}/tests")
   '';