With changes to arptables-nft output, many of these tests fail because rules are not printed as expected anymore. Since most of the tests with explicitly defined output did so just because of added --h-length and --h-type options, adjust input a little more (typically reordering of arguments) to make output match input. Signed-off-by: Phil Sutter <phil@xxxxxx> --- extensions/libarpt_CLASSIFY.t | 2 +- extensions/libarpt_MARK.t | 6 +++--- extensions/libarpt_mangle.t | 8 ++++---- extensions/libarpt_standard.t | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/libarpt_CLASSIFY.t b/extensions/libarpt_CLASSIFY.t index c30480d2b160c..0cf0f2ce8e736 100644 --- a/extensions/libarpt_CLASSIFY.t +++ b/extensions/libarpt_CLASSIFY.t @@ -1,4 +1,4 @@ :OUTPUT -o lo --destination-mac 11:22:33:44:55:66;-o lo --dst-mac 11:22:33:44:55:66;OK --dst-mac Broadcast ;--dst-mac ff:ff:ff:ff:ff:ff;OK -! -o eth+ -d 1.2.3.4/24 -j CLASSIFY --set-class 0000:0000;! -o eth+ -d 1.2.3.0/24 --h-length 6 --h-type 1 -j CLASSIFY --set-class 0000:0000;OK +! -o eth+ -d 1.2.3.4/24 -j CLASSIFY --set-class 0:0;-j CLASSIFY ! -o eth+ -d 1.2.3.0/24 --set-class 0:0;OK diff --git a/extensions/libarpt_MARK.t b/extensions/libarpt_MARK.t index cb4c2cb630357..3b13d44fd2c4b 100644 --- a/extensions/libarpt_MARK.t +++ b/extensions/libarpt_MARK.t @@ -1,4 +1,4 @@ :INPUT,OUTPUT --d 0.0.0.0/8 -j MARK --set-mark 0x1;-d 0.0.0.0/8 --h-length 6 --h-type 1 -j MARK --set-xmark 0x1/0xffffffff;OK --s ! 0.0.0.0 -j MARK --and-mark 0x17;! -s 0.0.0.0 --h-length 6 --h-type 1 -j MARK --set-xmark 0x0/0xffffffe8;OK --s 0.0.0.0 -j MARK --or-mark 0x17;-s 0.0.0.0 --h-length 6 --h-type 1 -j MARK --set-xmark 0x17/0x17;OK +-j MARK -d 0.0.0.0/8 --set-mark 1;=;OK +-s ! 0.0.0.0 -j MARK --and-mark 0x17;-j MARK ! -s 0.0.0.0 --and-mark 17;OK +-j MARK -s 0.0.0.0 --or-mark 17;=;OK diff --git a/extensions/libarpt_mangle.t b/extensions/libarpt_mangle.t index 1d4c3977d2a4c..da9669489d291 100644 --- a/extensions/libarpt_mangle.t +++ b/extensions/libarpt_mangle.t @@ -1,5 +1,5 @@ :OUTPUT --s 1.2.3.4 -j mangle --mangle-ip-s 1.2.3.5;-s 1.2.3.4 --h-length 6 --h-type 1 -j mangle --mangle-ip-s 1.2.3.5;OK --d 1.2.3.4 -j mangle --mangle-ip-d 1.2.3.5;-d 1.2.3.4 --h-length 6 --h-type 1 -j mangle --mangle-ip-d 1.2.3.5;OK --d 1.2.3.4 --h-length 6 --h-type 1 -j mangle --mangle-mac-d 00:01:02:03:04:05;=;OK --d 1.2.3.4 -j mangle --mangle-mac-s 00:01:02:03:04:05;=;FAIL +-j mangle -s 1.2.3.4 --mangle-ip-s 1.2.3.5;=;OK +-j mangle -d 1.2.3.4 --mangle-ip-d 1.2.3.5;=;OK +-j mangle -d 1.2.3.4 --mangle-mac-d 00:01:02:03:04:05;=;OK +-d 1.2.3.4 --h-length 5 -j mangle --mangle-mac-s 00:01:02:03:04:05;=;FAIL diff --git a/extensions/libarpt_standard.t b/extensions/libarpt_standard.t index 195865929c8d3..e84a00b780488 100644 --- a/extensions/libarpt_standard.t +++ b/extensions/libarpt_standard.t @@ -5,8 +5,8 @@ -d 192.168.0.1;=;OK ! -d 0.0.0.0;=;OK -d 0.0.0.0/24;=;OK --i lo -j DROP;-i lo --h-length 6 --h-type 1 -j DROP;OK -! -i lo -j ACCEPT;! -i lo --h-length 6 --h-type 1 -j ACCEPT;OK +-j DROP -i lo;=;OK +-j ACCEPT ! -i lo;=;OK -i ppp+;=;OK ! -i ppp+;=;OK -i lo --destination-mac 11:22:33:44:55:66;-i lo --dst-mac 11:22:33:44:55:66;OK -- 2.20.1
