diff --git a/test/vm/arr.nix b/test/vm/arr.nix index c490d02..264e6fd 100644 --- a/test/vm/arr.nix +++ b/test/vm/arr.nix @@ -45,7 +45,7 @@ let raise Exception(f"Code is {response['code']}") ''; - basic = appname: pkgs.nixosTest { + basic = appname: pkgs.testers.runNixOSTest { name = "arr-${appname}-basic"; nodes.server = { config, pkgs, ... }: { @@ -59,7 +59,6 @@ let ../../modules/blocks/postgresql.nix ../../modules/blocks/nginx.nix ../../modules/services/arr.nix - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") ]; diff --git a/test/vm/audiobookshelf.nix b/test/vm/audiobookshelf.nix index 6a8a4bc..795be7c 100644 --- a/test/vm/audiobookshelf.nix +++ b/test/vm/audiobookshelf.nix @@ -40,12 +40,11 @@ let ''; in { - basic = pkgs.nixosTest { + basic = pkgs.testers.runNixOSTest { name = "audiobookshelf-basic"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { @@ -71,12 +70,11 @@ in testScript = commonTestScript; }; - cert = pkgs.nixosTest { + cert = pkgs.testers.runNixOSTest { name = "audiobookshelf-cert"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { @@ -123,12 +121,11 @@ in testScript = commonTestScript; }; - sso = pkgs.nixosTest { + sso = pkgs.testers.runNixOSTest { name = "audiobookshelf-sso"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { diff --git a/test/vm/authelia.nix b/test/vm/authelia.nix index 6e06497..d6fdda9 100644 --- a/test/vm/authelia.nix +++ b/test/vm/authelia.nix @@ -5,12 +5,11 @@ let ldapAdminPassword = "ldapAdminPassword"; in { - basic = pkgs.nixosTest { + basic = pkgs.testers.runNixOSTest { name = "authelia-basic"; nodes.machine = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { diff --git a/test/vm/grocy.nix b/test/vm/grocy.nix index e0245db..869e6d0 100644 --- a/test/vm/grocy.nix +++ b/test/vm/grocy.nix @@ -40,12 +40,11 @@ let ''; in { - basic = pkgs.nixosTest { + basic = pkgs.testers.runNixOSTest { name = "grocy-basic"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { @@ -70,12 +69,11 @@ in testScript = commonTestScript; }; - cert = pkgs.nixosTest { + cert = pkgs.testers.runNixOSTest { name = "grocy-cert"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { diff --git a/test/vm/jellyfin.nix b/test/vm/jellyfin.nix index 23696fd..253424e 100644 --- a/test/vm/jellyfin.nix +++ b/test/vm/jellyfin.nix @@ -40,12 +40,11 @@ let ''; in { - basic = pkgs.nixosTest { + basic = pkgs.testers.runNixOSTest { name = "jellyfin-basic"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { @@ -71,12 +70,11 @@ in testScript = commonTestScript; }; - ldap = pkgs.nixosTest { + ldap = pkgs.testers.runNixOSTest { name = "jellyfin-ldap"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { @@ -122,12 +120,11 @@ in testScript = commonTestScript; }; - cert = pkgs.nixosTest { + cert = pkgs.testers.runNixOSTest { name = "jellyfin_cert"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { @@ -175,12 +172,11 @@ in testScript = commonTestScript; }; - sso = pkgs.nixosTest { + sso = pkgs.testers.runNixOSTest { name = "jellyfin_sso"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { diff --git a/test/vm/ldap.nix b/test/vm/ldap.nix index 6c8cf00..a6724ca 100644 --- a/test/vm/ldap.nix +++ b/test/vm/ldap.nix @@ -3,12 +3,11 @@ let pkgs' = pkgs; in { - auth = pkgs.nixosTest { + auth = pkgs.testers.runNixOSTest { name = "ldap-auth"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { diff --git a/test/vm/lib.nix b/test/vm/lib.nix index 7c18f9a..8ee7db1 100644 --- a/test/vm/lib.nix +++ b/test/vm/lib.nix @@ -42,12 +42,11 @@ in generator = lib.generators.toJSON {}; }; in - pkgs.nixosTest { + pkgs.testers.runNixOSTest { name = "lib-template"; nodes.machine = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { diff --git a/test/vm/monitoring.nix b/test/vm/monitoring.nix index f2ebbb0..15122d8 100644 --- a/test/vm/monitoring.nix +++ b/test/vm/monitoring.nix @@ -4,12 +4,11 @@ let in { # This test, although simple, makes sure all provisioning went fine. - auth = pkgs.nixosTest { + auth = pkgs.testers.runNixOSTest { name = "monitoring-basic"; nodes.machine = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { diff --git a/test/vm/nextcloud.nix b/test/vm/nextcloud.nix index 1c722fc..4d5056c 100644 --- a/test/vm/nextcloud.nix +++ b/test/vm/nextcloud.nix @@ -125,12 +125,11 @@ let ''; in { - basic = pkgs.nixosTest { + basic = pkgs.testers.runNixOSTest { name = "nextcloud-basic"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { @@ -168,12 +167,11 @@ in testScript = commonTestScript; }; - cert = pkgs.nixosTest { + cert = pkgs.testers.runNixOSTest { name = "nextcloud-cert"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") { diff --git a/test/vm/postgresql.nix b/test/vm/postgresql.nix index edf8fa0..9bd0163 100644 --- a/test/vm/postgresql.nix +++ b/test/vm/postgresql.nix @@ -3,12 +3,11 @@ let pkgs' = pkgs; in { - peerWithoutUser = pkgs.nixosTest { + peerWithoutUser = pkgs.testers.runNixOSTest { name = "postgresql-peerWithoutUser"; nodes.machine = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") ../../modules/blocks/postgresql.nix @@ -41,12 +40,11 @@ in ''; }; - peerAuth = pkgs.nixosTest { + peerAuth = pkgs.testers.runNixOSTest { name = "postgresql-peerAuth"; nodes.machine = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") ../../modules/blocks/postgresql.nix @@ -92,12 +90,11 @@ in ''; }; - tcpIPWithoutPasswordAuth = pkgs.nixosTest { + tcpIPWithoutPasswordAuth = pkgs.testers.runNixOSTest { name = "postgresql-tcpIpWithoutPasswordAuth"; nodes.machine = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") ../../modules/blocks/postgresql.nix @@ -131,12 +128,11 @@ in ''; }; - tcpIPPasswordAuth = pkgs.nixosTest { + tcpIPPasswordAuth = pkgs.testers.runNixOSTest { name = "postgresql-tcpIPPasswordAuth"; nodes.machine = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") ../../modules/blocks/postgresql.nix diff --git a/test/vm/ssl.nix b/test/vm/ssl.nix index d4f4dab..63d2303 100644 --- a/test/vm/ssl.nix +++ b/test/vm/ssl.nix @@ -3,12 +3,11 @@ let pkgs' = pkgs; in { - test = pkgs.nixosTest { + test = pkgs.testers.runNixOSTest { name = "ssl-test"; nodes.server = { config, pkgs, ... }: { imports = [ - (pkgs'.path + "/nixos/modules/profiles/minimal.nix") (pkgs'.path + "/nixos/modules/profiles/headless.nix") (pkgs'.path + "/nixos/modules/profiles/qemu-guest.nix") ../../modules/blocks/ssl.nix