swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154818 from qowoz/ecc-ignore

Browse source 
nixos/tests/systemd-networkd-vrf: move disabled check inline
This commit is contained in:
Maximilian Bosch 2022-01-15 23:22:56 +01:00 committed by GitHub
parent 1e4664e1a0 9917a5cf11
commit 0a223c8d50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.editorconfig
View file

@ -61,9 +61,6 @@ trim_trailing_whitespace = unset
[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
trim_trailing_whitespace = unset trim_trailing_whitespace = unset
[nixos/tests/systemd-networkd-vrf.nix]
trim_trailing_whitespace = unset
[pkgs/build-support/dotnetenv/Wrapper/**] [pkgs/build-support/dotnetenv/Wrapper/**]
end_of_line = unset end_of_line = unset
indent_style = unset indent_style = unset

2
nixos/tests/systemd-networkd-vrf.nix
View file

@ -161,6 +161,7 @@ in {
# NOTE: please keep in mind that the trailing whitespaces in the following strings # NOTE: please keep in mind that the trailing whitespaces in the following strings
# are intentional as the output is compared against the raw `iproute2`-output. # are intentional as the output is compared against the raw `iproute2`-output.
# editorconfig-checker-disable
client_ipv4_table = """ client_ipv4_table = """
192.168.1.2 dev vrf1 proto static metric 100 192.168.1.2 dev vrf1 proto static metric 100
192.168.2.3 dev vrf2 proto static metric 100 192.168.2.3 dev vrf2 proto static metric 100
@ -177,6 +178,7 @@ in {
local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1 local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1
broadcast 192.168.2.255 dev eth2 proto kernel scope link src 192.168.2.1 broadcast 192.168.2.255 dev eth2 proto kernel scope link src 192.168.2.1
""".strip() """.strip()
# editorconfig-checker-enable
# Check that networkd properly configures the main routing table # Check that networkd properly configures the main routing table
# and the routing tables for the VRF. # and the routing tables for the VRF.