Unverified Commit 99db54d1 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

nixosTests: fix eval (#411634)

parents f2e0bb75 fb24b403

nixos/tests/all-tests.nix

+15 −5
Original line number Diff line number Diff line
@@ -616,8 +616,14 @@ in 
  pyload = runTest ./pyload.nix;

  oci-containers = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./oci-containers.nix { };

  odoo = runTest ./odoo.nix;

  odoo17 = handleTest ./odoo.nix { package = pkgs.odoo17; };

  odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; };

  odoo17 = runTest {

    imports = [ ./odoo.nix ];

    _module.args.package = pkgs.odoo17;

  };

  odoo16 = runTest {

    imports = [ ./odoo.nix ];

    _module.args.package = pkgs.odoo16;

  };

  oncall = runTest ./web-apps/oncall.nix;

  # 9pnet_virtio used to mount /nix partition doesn't support

  # hibernation. This test happens to work on x86_64-linux but
@@ -1297,8 +1303,9 @@ in 
  systemd-initrd-btrfs-raid = runTest ./systemd-initrd-btrfs-raid.nix;

  systemd-initrd-luks-fido2 = runTest ./systemd-initrd-luks-fido2.nix;

  systemd-initrd-luks-keyfile = runTest ./systemd-initrd-luks-keyfile.nix;

  systemd-initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix {

    systemdStage1 = true;

  systemd-initrd-luks-empty-passphrase = runTest {

    imports = [ ./initrd-luks-empty-passphrase.nix ];

    _module.args.systemdStage1 = true;

  };

  systemd-initrd-luks-password = runTest ./systemd-initrd-luks-password.nix;

  systemd-initrd-luks-tpm2 = runTest ./systemd-initrd-luks-tpm2.nix;
@@ -1310,7 +1317,10 @@ in 
    "x86_64-linux"

    "i686-linux"

  ] ./initrd-network-openvpn { systemdStage1 = true; };

  systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; };

  systemd-initrd-shutdown = runTest {

    imports = [ ./systemd-shutdown.nix ];

    _module.args.systemdStage1 = true;

  };

  systemd-initrd-simple = runTest ./systemd-initrd-simple.nix;

  systemd-initrd-swraid = runTest ./systemd-initrd-swraid.nix;

  systemd-initrd-vconsole = runTest ./systemd-initrd-vconsole.nix;

nixos/tests/breitbandmessung.nix

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
  name = "breitbandmessung";

  meta.maintainers = with lib.maintainers; [ b4dm4n ];



  node.pkgsReadOnly = false;



  nodes.machine =

    { pkgs, ... }:

    {

nixos/tests/brscan5.nix

+18 −22
Original line number Diff line number Diff line 
# integration tests for brscan5 sane driver

#



{ pkgs, ... }:

{ lib, ... }:

{

  name = "brscan5";

  meta = with pkgs.lib.maintainers; {

    maintainers = [ mattchrist ];

  };

  meta.maintainers = with lib.maintainers; [ mattchrist ];



  nodes.machine =

    { pkgs, ... }:

    {

  node.pkgsReadOnly = false;



  nodes.machine = {

    nixpkgs.config.allowUnfree = true;

    hardware.sane = {

      enable = true;

nixos/tests/consul.nix

+3 −1
Original line number Diff line number Diff line 
{ pkgs, lib, ... }:

{ lib, ... }:



let

  # Settings for both servers and agents
@@ -117,6 +117,8 @@ in 
{

  name = "consul";



  node.pkgsReadOnly = false;



  nodes = {

    server1 = server 0;

    server2 = server 1;

nixos/tests/deconz.nix

+13 −18
Original line number Diff line number Diff line 
{ pkgs, lib, ... }:

{ lib, ... }:

let

  httpPort = 800;

in
@@ -9,14 +9,9 @@ in 
    bjornfor

  ];



  nodes.machine =

    {

      config,

      pkgs,

      lib,

      ...

    }:

    {

  node.pkgsReadOnly = false;



  nodes.machine = {

    nixpkgs.config.allowUnfree = true;

    services.deconz = {

      enable = true;