Skip to content

Commit c952291

Browse files
ahjf-07kuba-moo
authored andcommitted
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]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 6be2681 commit c952291

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

  • tools/testing/selftests/net

tools/testing/selftests/net/tun.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -944,8 +944,8 @@ TEST_F(tun_vnet_udptnl, send_gso_packet)
944944
ASSERT_EQ(ret, off);
945945

946946
ret = receive_gso_packet_from_tunnel(self, variant, &r_num_mss);
947-
ASSERT_EQ(ret, variant->data_size);
948-
ASSERT_EQ(r_num_mss, variant->r_num_mss);
947+
EXPECT_EQ(ret, variant->data_size);
948+
EXPECT_EQ(r_num_mss, variant->r_num_mss);
949949
}
950950

951951
TEST_F(tun_vnet_udptnl, recv_gso_packet)
@@ -955,18 +955,18 @@ TEST_F(tun_vnet_udptnl, recv_gso_packet)
955955
int ret, gso_type = VIRTIO_NET_HDR_GSO_UDP_L4;
956956

957957
ret = send_gso_packet_into_tunnel(self, variant);
958-
ASSERT_EQ(ret, variant->data_size);
958+
EXPECT_EQ(ret, variant->data_size);
959959

960960
memset(&vnet_hdr, 0, sizeof(vnet_hdr));
961961
ret = receive_gso_packet_from_tun(self, variant, &vnet_hdr);
962-
ASSERT_EQ(ret, variant->data_size);
962+
EXPECT_EQ(ret, variant->data_size);
963963

964964
if (!variant->no_gso) {
965-
ASSERT_EQ(vh->gso_size, variant->gso_size);
965+
EXPECT_EQ(vh->gso_size, variant->gso_size);
966966
gso_type |= (variant->tunnel_type & UDP_TUNNEL_OUTER_IPV4) ?
967967
(VIRTIO_NET_HDR_GSO_UDP_TUNNEL_IPV4) :
968968
(VIRTIO_NET_HDR_GSO_UDP_TUNNEL_IPV6);
969-
ASSERT_EQ(vh->gso_type, gso_type);
969+
EXPECT_EQ(vh->gso_type, gso_type);
970970
}
971971
}
972972

0 commit comments

Comments
 (0)