selftests: Drop 'pref medium' in route checks (eb682677) · Commits · 戴 / test

The 'pref medium' attribute was moved in iproute2 to be near the prefix which is where it applies versus after the last nexthop. The nexthop tests were updated to drop the string from route checking, but it crept in again with the compat tests. Fixes: ("selftests: net: add new testcases for nexthop API compat mode sysctl") Signed-off-by:

David Ahern <dsahern@gmail.com> Cc: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

tools/testing/selftests/net/fib_nexthops.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -965,7 +965,7 @@ ipv6_compat_mode()
		log_test $? 0 "IPv6 compat mode on - route add notification"

		# route dump should contain expanded nexthops
		check_route6 "2001:db8:101::1" "2001:db8:101::1 nhid 122 metric 1024 pref medium nexthop via 2001:db8:91::2 dev veth1 weight 1 nexthop via 2001:db8:91::3 dev veth1 weight 1"
		check_route6 "2001:db8:101::1" "2001:db8:101::1 nhid 122 metric 1024 nexthop via 2001:db8:91::2 dev veth1 weight 1 nexthop via 2001:db8:91::3 dev veth1 weight 1"
		log_test $? 0 "IPv6 compat mode on - route dump"

		# change in nexthop group should generate route notification
		@@ -992,7 +992,7 @@ ipv6_compat_mode()
		log_test $? 0 "IPv6 compat mode off - route add notification"

		# route dump should not contain expanded nexthops
		check_route6 "2001:db8:101::1" "2001:db8:101::1 nhid 122 metric 1024 pref medium"
		check_route6 "2001:db8:101::1" "2001:db8:101::1 nhid 122 metric 1024"
		log_test $? 0 "IPv6 compat mode off - route dump"

		# change in nexthop group should not generate route notification

Admin message