From 67761345c8f2d01f41eb8bbeb0dc8f5d94b4e576 Mon Sep 17 00:00:00 2001
From: Zeling Feng <zeling@google.com>
Date: Thu, 25 Feb 2021 14:58:37 -0800
Subject: Move SetNonblocking into posix_server

- open flags can be different on different OSs, by putting SetNonblocking into
the posix_server rather than the testbench, we can always get the right value
for O_NONBLOCK
- merged the tcp_queue_{send,receive}_in_syn_sent into a single file

PiperOrigin-RevId: 359620630
---
 test/packetimpact/runner/defs.bzl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'test/packetimpact/runner')

diff --git a/test/packetimpact/runner/defs.bzl b/test/packetimpact/runner/defs.bzl
index 52ed5ae39..8ce5edf2b 100644
--- a/test/packetimpact/runner/defs.bzl
+++ b/test/packetimpact/runner/defs.bzl
@@ -128,14 +128,14 @@ def packetimpact_go_test(name, expect_native_failure = False, expect_netstack_fa
     packetimpact_native_test(
         name = name,
         expect_failure = expect_native_failure,
-        testbench_binary = testbench_binary,
         num_duts = num_duts,
+        testbench_binary = testbench_binary,
     )
     packetimpact_netstack_test(
         name = name,
         expect_failure = expect_netstack_failure,
-        testbench_binary = testbench_binary,
         num_duts = num_duts,
+        testbench_binary = testbench_binary,
     )
 
 def packetimpact_testbench(name, size = "small", pure = True, **kwargs):
@@ -161,7 +161,11 @@ def packetimpact_testbench(name, size = "small", pure = True, **kwargs):
 
 PacketimpactTestInfo = provider(
     doc = "Provide information for packetimpact tests",
-    fields = ["name", "expect_netstack_failure", "num_duts"],
+    fields = [
+        "name",
+        "expect_netstack_failure",
+        "num_duts",
+    ],
 )
 
 ALL_TESTS = [
@@ -219,7 +223,7 @@ ALL_TESTS = [
         name = "tcp_zero_receive_window",
     ),
     PacketimpactTestInfo(
-        name = "tcp_queue_receive_in_syn_sent",
+        name = "tcp_queue_send_recv_in_syn_sent",
     ),
     PacketimpactTestInfo(
         name = "tcp_synsent_reset",
@@ -241,9 +245,6 @@ ALL_TESTS = [
         # TODO(b/168523247): Fix netstack then remove the line below.
         expect_netstack_failure = True,
     ),
-    PacketimpactTestInfo(
-        name = "tcp_queue_send_in_syn_sent",
-    ),
     PacketimpactTestInfo(
         name = "icmpv6_param_problem",
     ),
-- 
cgit v1.2.3