1 files changed, 40 insertions, 43 deletions
diff --git a/test/packetimpact/tests/BUILD b/test/packetimpact/tests/BUILD
index 11db49e39..8c2de5a9f 100644
--- a/test/packetimpact/tests/BUILD
+++ b/test/packetimpact/tests/BUILD
@@ -1,11 +1,11 @@
-load("//test/packetimpact/runner:defs.bzl", "packetimpact_go_test")
+load("//test/packetimpact/runner:defs.bzl", "ALL_TESTS", "packetimpact_go_test", "packetimpact_testbench", "validate_all_tests")
 
 package(
     default_visibility = ["//test/packetimpact:__subpackages__"],
     licenses = ["notice"],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "fin_wait2_timeout",
     srcs = ["fin_wait2_timeout_test.go"],
     deps = [
@@ -15,7 +15,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "ipv4_id_uniqueness",
     srcs = ["ipv4_id_uniqueness_test.go"],
     deps = [
@@ -26,7 +26,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "udp_discard_mcast_source_addr",
     srcs = ["udp_discard_mcast_source_addr_test.go"],
     deps = [
@@ -37,7 +37,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "udp_recv_mcast_bcast",
     srcs = ["udp_recv_mcast_bcast_test.go"],
     deps = [
@@ -49,7 +49,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "udp_any_addr_recv_unicast",
     srcs = ["udp_any_addr_recv_unicast_test.go"],
     deps = [
@@ -60,7 +60,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "udp_icmp_error_propagation",
     srcs = ["udp_icmp_error_propagation_test.go"],
     deps = [
@@ -71,11 +71,9 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_reordering",
     srcs = ["tcp_reordering_test.go"],
-    # TODO(b/139368047): Fix netstack then remove the line below.
-    expect_netstack_failure = True,
     deps = [
         "//pkg/tcpip/header",
         "//pkg/tcpip/seqnum",
@@ -84,7 +82,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_window_shrink",
     srcs = ["tcp_window_shrink_test.go"],
     deps = [
@@ -94,7 +92,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_zero_window_probe",
     srcs = ["tcp_zero_window_probe_test.go"],
     deps = [
@@ -104,7 +102,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_zero_window_probe_retransmit",
     srcs = ["tcp_zero_window_probe_retransmit_test.go"],
     deps = [
@@ -114,7 +112,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_zero_window_probe_usertimeout",
     srcs = ["tcp_zero_window_probe_usertimeout_test.go"],
     deps = [
@@ -124,7 +122,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_retransmits",
     srcs = ["tcp_retransmits_test.go"],
     deps = [
@@ -134,7 +132,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_outside_the_window",
     srcs = ["tcp_outside_the_window_test.go"],
     deps = [
@@ -145,7 +143,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_noaccept_close_rst",
     srcs = ["tcp_noaccept_close_rst_test.go"],
     deps = [
@@ -155,7 +153,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_send_window_sizes_piggyback",
     srcs = ["tcp_send_window_sizes_piggyback_test.go"],
     deps = [
@@ -165,7 +163,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_unacc_seq_ack",
     srcs = ["tcp_unacc_seq_ack_test.go"],
     deps = [
@@ -176,11 +174,9 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_paws_mechanism",
     srcs = ["tcp_paws_mechanism_test.go"],
-    # TODO(b/156682000): Fix netstack then remove the line below.
-    expect_netstack_failure = True,
     deps = [
         "//pkg/tcpip/header",
         "//pkg/tcpip/seqnum",
@@ -189,7 +185,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_user_timeout",
     srcs = ["tcp_user_timeout_test.go"],
     deps = [
@@ -199,7 +195,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_queue_receive_in_syn_sent",
     srcs = ["tcp_queue_receive_in_syn_sent_test.go"],
     deps = [
@@ -209,7 +205,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_synsent_reset",
     srcs = ["tcp_synsent_reset_test.go"],
     deps = [
@@ -219,7 +215,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_synrcvd_reset",
     srcs = ["tcp_synrcvd_reset_test.go"],
     deps = [
@@ -229,7 +225,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_network_unreachable",
     srcs = ["tcp_network_unreachable_test.go"],
     deps = [
@@ -239,7 +235,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_cork_mss",
     srcs = ["tcp_cork_mss_test.go"],
     deps = [
@@ -249,7 +245,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_handshake_window_size",
     srcs = ["tcp_handshake_window_size_test.go"],
     deps = [
@@ -259,11 +255,9 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_timewait_reset",
     srcs = ["tcp_timewait_reset_test.go"],
-    # TODO(b/168523247): Fix netstack then remove the line below.
-    expect_netstack_failure = True,
     deps = [
         "//pkg/tcpip/header",
         "//test/packetimpact/testbench",
@@ -271,7 +265,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_queue_send_in_syn_sent",
     srcs = ["tcp_queue_send_in_syn_sent_test.go"],
     deps = [
@@ -281,11 +275,9 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "icmpv6_param_problem",
     srcs = ["icmpv6_param_problem_test.go"],
-    # TODO(b/153485026): Fix netstack then remove the line below.
-    expect_netstack_failure = True,
     deps = [
         "//pkg/tcpip",
         "//pkg/tcpip/header",
@@ -294,11 +286,9 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "ipv6_unknown_options_action",
     srcs = ["ipv6_unknown_options_action_test.go"],
-    # TODO(b/159928940): Fix netstack then remove the line below.
-    expect_netstack_failure = True,
     deps = [
         "//pkg/tcpip",
         "//pkg/tcpip/header",
@@ -307,7 +297,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "ipv6_fragment_reassembly",
     srcs = ["ipv6_fragment_reassembly_test.go"],
     deps = [
@@ -319,7 +309,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "udp_send_recv_dgram",
     srcs = ["udp_send_recv_dgram_test.go"],
     deps = [
@@ -329,7 +319,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_linger",
     srcs = ["tcp_linger_test.go"],
     deps = [
@@ -339,7 +329,7 @@ packetimpact_go_test(
     ],
 )
 
-packetimpact_go_test(
+packetimpact_testbench(
     name = "tcp_rcv_buf_space",
     srcs = ["tcp_rcv_buf_space_test.go"],
     deps = [
@@ -348,3 +338,10 @@ packetimpact_go_test(
         "@org_golang_x_sys//unix:go_default_library",
     ],
 )
+
+validate_all_tests()
+
+[packetimpact_go_test(
+    name = t.name,
+    expect_netstack_failure = hasattr(t, "expect_netstack_failure"),
+) for t in ALL_TESTS]