Unverified Commit 6574d902 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

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

nixos/tests/nextcloud: Fix deprecation warning
parents 068c2b1b 14f7b116

nixos/tests/nextcloud/basic.nix

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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")