selftests: net: tun: don't abort XFAIL cases
Subsystems (3)
PATCH v3 2/2 selftests: net: tun: don't abort XFAIL cases
The tun UDP tunnel GSO fixture contains XFAIL-marked variants intended to exercise failure paths (e.g. EMSGSIZE / "Message too long"). Using ASSERT_EQ() in these tests aborts the subtest, which prevents the harness from classifying them as XFAIL and can make the overall net: tun test fail.
Switch the relevant ASSERT_EQ() checks to EXPECT_EQ() so the subtests continue running and the failures are correctly reported and accounted as XFAIL where applicable.
Signed-off-by Sun Jian <[email protected]>
--- tools/testing/selftests/net/tun.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/testing/selftests/net/tun.c +6 -6
@@ -944,8 +944,8 @@ TEST_F(tun_vnet_udptnl, send_gso_packet)ASSERT_EQ (ret, off); ret =receive_gso_packet_from_tunnel (self, variant, &r_num_mss); -ASSERT_EQ (ret, variant->data_size); -ASSERT_EQ (r_num_mss, variant->r_num_mss); +EXPECT_EQ (ret, variant->data_size); +EXPECT_EQ (r_num_mss, variant->r_num_mss); }TEST_F (tun_vnet_udptnl, recv_gso_packet)
@@ -955,18 +955,18 @@ TEST_F(tun_vnet_udptnl, recv_gso_packet)int ret, gso_type =VIRTIO_NET_HDR_GSO_UDP_L4 ; ret =send_gso_packet_into_tunnel (self, variant); -ASSERT_EQ (ret, variant->data_size); +EXPECT_EQ (ret, variant->data_size);memset (&vnet_hdr,0 ,sizeof (vnet_hdr)); ret =receive_gso_packet_from_tun (self, variant, &vnet_hdr); -ASSERT_EQ (ret, variant->data_size); +EXPECT_EQ (ret, variant->data_size);if (!variant->no_gso) { -ASSERT_EQ (vh->gso_size, variant->gso_size); +EXPECT_EQ (vh->gso_size, variant->gso_size); gso_type |= (variant->tunnel_type &UDP_TUNNEL_OUTER_IPV4 ) ? (VIRTIO_NET_HDR_GSO_UDP_TUNNEL_IPV4 ) : (VIRTIO_NET_HDR_GSO_UDP_TUNNEL_IPV6 ); -ASSERT_EQ (vh->gso_type, gso_type); +EXPECT_EQ (vh->gso_type, gso_type); } }
Signature · 1 line
2.43.0