pyrox.dev
Merge pull request #238250 from Ma27/nextcloud-declarative-test-fix
nixos/tests/nextcloud: fix more issues related to redis tests
authored by Maximilian Bosch and committed by GitHub 30c0a2f7 6069d0b4
+10
-5
nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
+10
-5
nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
···
1
-
import ../make-test-python.nix ({ pkgs, ...}: let
1
+
args@{ nextcloudVersion ? 27, ... }:
2
+
(import ../make-test-python.nix ({ pkgs, ...}: let
2
3
username = "custom_admin_username";
3
4
# This will be used both for redis and postgresql
4
5
pass = "hunter2";
···
9
10
in {
10
11
name = "nextcloud-with-declarative-redis";
11
12
meta = with pkgs.lib.maintainers; {
12
-
maintainers = [ eqyiel ];
13
+
maintainers = [ eqyiel ma27 ];
13
14
};
14
15
15
16
nodes = {
···
22
23
services.nextcloud = {
23
24
enable = true;
24
25
hostName = "nextcloud";
26
+
package = pkgs.${"nextcloud" + (toString nextcloudVersion)};
25
27
caching = {
26
28
apcu = false;
27
29
redis = true;
···
47
49
configureRedis = true;
48
50
};
49
51
50
-
services.redis.servers."nextcloud".enable = true;
51
-
services.redis.servers."nextcloud".port = 6379;
52
+
services.redis.servers."nextcloud" = {
53
+
enable = true;
54
+
port = 6379;
55
+
requirePass = "secret";
56
+
};
52
57
53
58
systemd.services.nextcloud-setup= {
54
59
requires = ["postgresql.service"];
···
114
119
# redis cache should not be empty
115
120
nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"')
116
121
'';
117
-
})
122
+
})) args
+3
nixos/tests/nextcloud/with-postgresql-and-redis.nix
+3
nixos/tests/nextcloud/with-postgresql-and-redis.nix
···
89
89
"${withRcloneEnv} ${diffSharedFile}"
90
90
)
91
91
nextcloud.wait_until_succeeds("journalctl -u nextcloud-notify_push | grep -q \"Sending ping to ${adminuser}\"")
92
+
93
+
# redis cache should not be empty
94
+
nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"')
92
95
'';
93
96
})) args