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

Merge pull request #248154 from onny/nextcloud-tests-fix

Browse Source 
nixos/tests/nextcloud: Fix deprecation warning
This commit is contained in:
Franz Pletz
2023-08-10 04:18:27 +02:00
committed by GitHub
parent 068c2b1b7b 14f7b1161d
commit 6574d90239
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/tests/nextcloud/basic.nix
+2 -2
View File
@@ -90,8 +90,8 @@ in {
test -e graph
grep "$what" graph >$out || true
'';
nextcloudUsesImagick = findInClosure "imagick" nodes.nextcloud.config.system.build.vm;
nextcloudWithoutDoesntUseIt = findInClosure "imagick" nodes.nextcloudWithoutMagick.config.system.build.vm;
nextcloudUsesImagick = findInClosure "imagick" nodes.nextcloud.system.build.vm;
nextcloudWithoutDoesntUseIt = findInClosure "imagick" nodes.nextcloudWithoutMagick.system.build.vm;
in ''
assert open("${nextcloudUsesImagick}").read() != ""
assert open("${nextcloudWithoutDoesntUseIt}").read() == ""
nixos/tests/nextcloud/openssl-sse.nix
+2 -2
View File
@@ -49,8 +49,8 @@ in {
#!${pkgs.runtimeShell}
echo 'bye' | ${withRcloneEnv3} ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file2
'';
openssl1-node = nodes.nextcloudwithopenssl1.config.system.build.toplevel;
openssl3-node = nodes.nextcloudwithopenssl3.config.system.build.toplevel;
openssl1-node = nodes.nextcloudwithopenssl1.system.build.toplevel;
openssl3-node = nodes.nextcloudwithopenssl3.system.build.toplevel;
in ''
nextcloudwithopenssl1.start()
nextcloudwithopenssl1.wait_for_unit("multi-user.target")