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; firefoxpwa = runTest ./firefoxpwa.nix;
firejail = runTest ./firejail.nix; firejail = runTest ./firejail.nix;
firewall = handleTest ./firewall.nix { nftables = false; }; firewall = runTest {
firewall-nftables = handleTest ./firewall.nix { nftables = true; }; imports = [ ./firewall.nix ];
_module.args.nftables = false;
};
firewall-nftables = runTest {
imports = [ ./firewall.nix ];
_module.args.nftables = true;
};
fish = runTest ./fish.nix; fish = runTest ./fish.nix;
firezone = runTest ./firezone/firezone.nix; firezone = runTest ./firezone/firezone.nix;
flannel = handleTestOn [ "x86_64-linux" ] ./flannel.nix { }; flannel = handleTestOn [ "x86_64-linux" ] ./flannel.nix { };

8
nixos/tests/firewall.nix
View File

@ -1,10 +1,9 @@
# Test the firewall module. # Test the firewall module.
import ./make-test-python.nix ( { lib, nftables, ... }:
{ pkgs, nftables, ... }:
{ {
name = "firewall" + pkgs.lib.optionalString nftables "-nftables"; name = "firewall" + lib.optionalString nftables "-nftables";
meta = with pkgs.lib.maintainers; { meta = with lib.maintainers; {
maintainers = [ maintainers = [
rvfg rvfg
garyguo garyguo
@ -116,4 +115,3 @@ import ./make-test-python.nix (
) )
''; '';
} }
)