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

nixos/redis: cleanup tests

Browse Source
This commit is contained in:
Julien Moutinho
2021-10-23 05:44:07 +02:00
committed by tomberek
parent 7475554372
commit 5cf90a60e5
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/prometheus-exporters.nix
View File

@@ -939,7 +939,7 @@ let
exporterConfig = { exporterConfig = {
enable = true; enable = true;
}; };
metricProvider.services.redis.enable = true; metricProvider.services.redis.servers."".enable = true;
exporterTest = '' exporterTest = ''
wait_for_unit("redis.service") wait_for_unit("redis.service")
wait_for_unit("prometheus-redis-exporter.service") wait_for_unit("prometheus-redis-exporter.service")

36
nixos/tests/redis.nix
View File

@@ -1,7 +1,4 @@
import ./make-test-python.nix ({ pkgs, ... }: import ./make-test-python.nix ({ pkgs, ... }:
let
redisSocket = "/run/redis/redis.sock";
in
{ {
name = "redis"; name = "redis";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
@@ -10,35 +7,40 @@ in
nodes = { nodes = {
machine = machine =
{ pkgs, ... }: { pkgs, lib, ... }: with lib;
{ {
services.redis.enable = true; services.redis.servers."".enable = true;
services.redis.unixSocket = redisSocket; services.redis.servers."test".enable = true;
# Allow access to the unix socket for the "redis" group. users.users = listToAttrs (map (suffix: nameValuePair "member${suffix}" {
services.redis.unixSocketPerm = 770;
users.users."member" = {
createHome = false; createHome = false;
description = "A member of the redis group"; description = "A member of the redis${suffix} group";
isNormalUser = true; isNormalUser = true;
extraGroups = [ extraGroups = [ "redis${suffix}" ];
"redis" }) ["" "-test"]);
];
};
}; };
}; };
testScript = '' testScript = { nodes, ... }: let
inherit (nodes.machine.config.services) redis;
in ''
start_all() start_all()
machine.wait_for_unit("redis") 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_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 # The unix socket is accessible to the redis group
machine.succeed('su member -c "redis-cli ping | grep PONG"') 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 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")
''; '';
}) })

10
nixos/tests/txredisapi.nix
View File

@@ -10,17 +10,19 @@ import ./make-test-python.nix ({ pkgs, ... }:
{ pkgs, ... }: { pkgs, ... }:
{ {
services.redis.enable = true; services.redis.servers."".enable = true;
services.redis.unixSocket = "/run/redis/redis.sock";
environment.systemPackages = with pkgs; [ (python38.withPackages (ps: [ ps.twisted ps.txredisapi ps.mock ]))]; 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() start_all()
machine.wait_for_unit("redis") 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") tests = machine.succeed("PYTHONPATH=\"${pkgs.python3Packages.txredisapi.src}\" python -m twisted.trial ${pkgs.python3Packages.txredisapi.src}/tests")
''; '';