talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixosTests.firewall{,-nftables}: handleTest -> runTest

Browse Source
This commit is contained in:
Sizhe Zhao 2025-06-07 21:39:30 +08:00
parent ab94f9518a
commit bb76321386
No known key found for this signature in database
GPG Key ID: ED1807251A7DA08F
2 changed files with 104 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/tests/all-tests.nix
View File

@ -520,8 +520,14 @@ in
};
firefoxpwa = runTest ./firefoxpwa.nix;
firejail = runTest ./firejail.nix;
firewall = handleTest ./firewall.nix { nftables = false; };
firewall-nftables = handleTest ./firewall.nix { nftables = true; };
firewall = runTest {
imports = [ ./firewall.nix ];
_module.args.nftables = false;
};
firewall-nftables = runTest {
imports = [ ./firewall.nix ];
_module.args.nftables = true;
};
fish = runTest ./fish.nix;
firezone = runTest ./firezone/firezone.nix;
flannel = handleTestOn [ "x86_64-linux" ] ./flannel.nix { };

12
nixos/tests/firewall.nix
View File

@ -1,10 +1,9 @@
# Test the firewall module.
import ./make-test-python.nix (
{ pkgs, nftables, ... }:
{
name = "firewall" + pkgs.lib.optionalString nftables "-nftables";
meta = with pkgs.lib.maintainers; {
{ lib, nftables, ... }:
{
name = "firewall" + lib.optionalString nftables "-nftables";
meta = with lib.maintainers; {
maintainers = [
rvfg
garyguo
@ -115,5 +114,4 @@ import ./make-test-python.nix (
"/run/booted-system/specialisation/different-config/bin/switch-to-configuration test 2>&1 | grep -qF ${unit}.service"
)
'';
}
)
}