From 9917a5cf11ffc2e5dec598f7fe4eda1869c39095 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 13 Jan 2022 09:14:26 +1000 Subject: [PATCH] nixos/tests/systemd-networkd-vrf: move disabled check inline --- .editorconfig | 3 --- nixos/tests/systemd-networkd-vrf.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 7d0157a6c427..b780def5d11e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -61,9 +61,6 @@ trim_trailing_whitespace = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] trim_trailing_whitespace = unset -[nixos/tests/systemd-networkd-vrf.nix] -trim_trailing_whitespace = unset - [pkgs/build-support/dotnetenv/Wrapper/**] end_of_line = unset indent_style = unset diff --git a/nixos/tests/systemd-networkd-vrf.nix b/nixos/tests/systemd-networkd-vrf.nix index 9f09d801f77a..8a1580fc2ada 100644 --- a/nixos/tests/systemd-networkd-vrf.nix +++ b/nixos/tests/systemd-networkd-vrf.nix @@ -161,6 +161,7 @@ in { # 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. + # editorconfig-checker-disable client_ipv4_table = """ 192.168.1.2 dev vrf1 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 broadcast 192.168.2.255 dev eth2 proto kernel scope link src 192.168.2.1 """.strip() + # editorconfig-checker-enable # Check that networkd properly configures the main routing table # and the routing tables for the VRF.