colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openvpn: fix tests and add to passthru.tests

Browse Source
This commit is contained in:
Yongun Seong 2023-12-20 18:23:08 +09:00
parent 3deee92686
commit 52bdb3481c
No known key found for this signature in database
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,7 +406,7 @@ in {
incus = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; });
influxdb = handleTest ./influxdb.nix {};
influxdb2 = handleTest ./influxdb2.nix {};
initrd-network-openvpn = handleTest ./initrd-network-openvpn {};
initrd-network-openvpn = handleTestOn [ "x86_64-linux" "i686-linux" ] ./initrd-network-openvpn {};
initrd-network-ssh = handleTest ./initrd-network-ssh {};
initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix {};
initrdNetwork = handleTest ./initrd-network.nix {};
@ -830,7 +830,7 @@ in {
systemd-initrd-vconsole = handleTest ./systemd-initrd-vconsole.nix {};
systemd-initrd-networkd = handleTest ./systemd-initrd-networkd.nix {};
systemd-initrd-networkd-ssh = handleTest ./systemd-initrd-networkd-ssh.nix {};
systemd-initrd-networkd-openvpn = handleTest ./initrd-network-openvpn { systemdStage1 = true; };
systemd-initrd-networkd-openvpn = handleTestOn [ "x86_64-linux" "i686-linux" ] ./initrd-network-openvpn { systemdStage1 = true; };
systemd-initrd-vlan = handleTest ./systemd-initrd-vlan.nix {};
systemd-journal = handleTest ./systemd-journal.nix {};
systemd-machinectl = handleTest ./systemd-machinectl.nix {};

15
nixos/tests/initrd-network-openvpn/default.nix
View File

@ -59,18 +59,19 @@ import ../make-test-python.nix ({ lib, ...}:
# This command does not fork to keep the VM in the state where
# only the initramfs is loaded
preLVMCommands =
''
/bin/nc -p 1234 -lke /bin/echo TESTVALUE
'';
preLVMCommands = lib.mkIf (!systemdStage1)
''
/bin/nc -p 1234 -lke /bin/echo TESTVALUE
'';
network = {
enable = true;
# Work around udhcpc only getting a lease on eth0
postCommands = ''
/bin/ip addr add 192.168.1.2/24 dev eth1
'';
postCommands = lib.mkIf (!systemdStage1)
''
/bin/ip addr add 192.168.1.2/24 dev eth1
'';
# Example configuration for OpenVPN
# This is the main reason for this test

10
pkgs/tools/networking/openvpn/default.nix
View File

@ -14,6 +14,7 @@
, update-systemd-resolved
, pkcs11Support ? false
, pkcs11helper
, nixosTests
}:
let
@ -75,9 +76,14 @@ let
in
{
openvpn = generic {
openvpn = (generic {
version = "2.6.8";
sha256 = "sha256-Xt4VZcim2IAQD38jUxen7p7qg9UFLbVUfxOp52r3gF0=";
extraBuildInputs = [ openssl ];
};
}).overrideAttrs
(_: {
passthru.tests = {
inherit (nixosTests) initrd-network-openvpn systemd-initrd-networkd-openvpn;
};
});
}