diff options
author | Julien Moutinho <julm+nixpkgs@sourcephile.fr> | 2021-10-23 05:44:07 +0200 |
---|---|---|
committer | tomberek <tomberek@users.noreply.github.com> | 2021-12-13 14:42:19 -0500 |
commit | 5cf90a60e5ddf68fbfc04d643970136bf00ba315 (patch) | |
tree | 537ae30a11cd923d8c13cb53e8aa505c14cfb83b /nixos/tests/redis.nix | |
parent | 747555437232a73184e8eab6daae368047042709 (diff) |
nixos/redis: cleanup tests
Diffstat (limited to 'nixos/tests/redis.nix')
-rw-r--r-- | nixos/tests/redis.nix | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix index 28b6058c2c026..7b70c239ad6ed 100644 --- a/nixos/tests/redis.nix +++ b/nixos/tests/redis.nix @@ -1,7 +1,4 @@ import ./make-test-python.nix ({ pkgs, ... }: -let - redisSocket = "/run/redis/redis.sock"; -in { name = "redis"; meta = with pkgs.lib.maintainers; { @@ -10,35 +7,40 @@ in nodes = { machine = - { pkgs, ... }: + { pkgs, lib, ... }: with lib; { - services.redis.enable = true; - services.redis.unixSocket = redisSocket; + services.redis.servers."".enable = true; + services.redis.servers."test".enable = true; - # Allow access to the unix socket for the "redis" group. - services.redis.unixSocketPerm = 770; - - users.users."member" = { + users.users = listToAttrs (map (suffix: nameValuePair "member${suffix}" { createHome = false; - description = "A member of the redis group"; + description = "A member of the redis${suffix} group"; isNormalUser = true; - extraGroups = [ - "redis" - ]; - }; + extraGroups = [ "redis${suffix}" ]; + }) ["" "-test"]); }; }; - testScript = '' + testScript = { nodes, ... }: let + inherit (nodes.machine.config.services) redis; + in '' start_all() machine.wait_for_unit("redis") + machine.wait_for_unit("redis-test") + + # The unnamed Redis server still opens a port for backward-compatibility machine.wait_for_open_port("6379") + machine.wait_for_file("${redis.servers."".unixSocket}") + machine.wait_for_file("${redis.servers."test".unixSocket}") + # The unix socket is accessible to the redis group machine.succeed('su member -c "redis-cli ping | grep PONG"') + machine.succeed('su member-test -c "redis-cli ping | grep PONG"') machine.succeed("redis-cli ping | grep PONG") - machine.succeed("redis-cli -s ${redisSocket} ping | grep PONG") + machine.succeed("redis-cli -s ${redis.servers."".unixSocket} ping | grep PONG") + machine.succeed("redis-cli -s ${redis.servers."test".unixSocket} ping | grep PONG") ''; }) |