hsa: unify echo test setup
Type: test
Change-Id: I8665492c2f7755901a428aacdb27e98329ff557a
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
diff --git a/test/asf/test_quic.py b/test/asf/test_quic.py
index 0d615d5..2414186 100644
--- a/test/asf/test_quic.py
+++ b/test/asf/test_quic.py
@@ -139,9 +139,9 @@
def setUp(self):
super(QUICEchoIntTestCase, self).setUp()
self.client_args = (
- f"uri {self.uri} fifo-size 64{self.test_bytes} appns {self.client_appns} "
+ f"uri {self.uri} fifo-size 64k{self.test_bytes} appns {self.client_appns} "
)
- self.server_args = f"uri {self.uri} fifo-size 64 appns {self.server_appns} "
+ self.server_args = f"uri {self.uri} fifo-size 64k appns {self.server_appns} "
def tearDown(self):
super(QUICEchoIntTestCase, self).tearDown()
@@ -168,7 +168,7 @@
def test_quic_int_transfer(self):
"""QUIC internal transfer"""
self.server()
- self.client("no-output", "mbytes", "2")
+ self.client("mbytes", "2")
@tag_fixme_vpp_workers
@@ -178,11 +178,11 @@
def test_quic_serial_int_transfer(self):
"""QUIC serial internal transfer"""
self.server()
- self.client("no-output", "mbytes", "2")
- self.client("no-output", "mbytes", "2")
- self.client("no-output", "mbytes", "2")
- self.client("no-output", "mbytes", "2")
- self.client("no-output", "mbytes", "2")
+ self.client("mbytes", "2")
+ self.client("mbytes", "2")
+ self.client("mbytes", "2")
+ self.client("mbytes", "2")
+ self.client("mbytes", "2")
@tag_fixme_vpp_workers
@@ -192,7 +192,7 @@
def test_quic_int_multistream_transfer(self):
"""QUIC internal multi-stream transfer"""
self.server()
- self.client("nclients", "10", "mbytes", "1", "no-output")
+ self.client("nclients", "10", "mbytes", "1")
class QUICEchoExtTestCase(QUICTestCase):
diff --git a/test/asf/test_session.py b/test/asf/test_session.py
index d013815..885d66c 100644
--- a/test/asf/test_session.py
+++ b/test/asf/test_session.py
@@ -79,7 +79,7 @@
# Start builtin server and client with small private segments
uri = "tcp://" + self.loop0.local_ip4 + "/1234"
error = self.vapi.cli(
- "test echo server appns 0 fifo-size 64 "
+ "test echo server appns 0 fifo-size 64k "
+ "private-segment-size 1m uri "
+ uri
)
@@ -89,7 +89,7 @@
error = self.vapi.cli(
"test echo client nclients 100 appns 1 "
- + "no-output fifo-size 64 syn-timeout 2 "
+ + "fifo-size 64k syn-timeout 2 "
+ "private-segment-size 1m uri "
+ uri
)
diff --git a/test/asf/test_tcp.py b/test/asf/test_tcp.py
index 184e570..4a16d57 100644
--- a/test/asf/test_tcp.py
+++ b/test/asf/test_tcp.py
@@ -73,14 +73,14 @@
# Start builtin server and client
uri = "tcp://" + self.loop0.local_ip4 + "/1234"
- error = self.vapi.cli("test echo server appns 0 fifo-size 4 uri " + uri)
+ error = self.vapi.cli("test echo server appns 0 fifo-size 4k uri " + uri)
if error:
self.logger.critical(error)
self.assertNotIn("failed", error)
error = self.vapi.cli(
"test echo client mbytes 10 appns 1 "
- + "fifo-size 4 no-output test-bytes "
+ + "fifo-size 4k test-bytes "
+ "syn-timeout 2 uri "
+ uri
)
diff --git a/test/asf/test_tls.py b/test/asf/test_tls.py
index 89ee450..e70c63d 100644
--- a/test/asf/test_tls.py
+++ b/test/asf/test_tls.py
@@ -129,7 +129,7 @@
# Start builtin server and client
uri = "tls://" + self.loop0.local_ip4 + "/1234"
error = self.vapi.cli(
- "test echo server appns 0 fifo-size 4 tls-engine 1 uri " + uri
+ "test echo server appns 0 fifo-size 4k tls-engine 1 uri " + uri
)
if error:
self.logger.critical(error)
@@ -137,7 +137,7 @@
error = self.vapi.cli(
"test echo client mbytes 10 appns 1 "
- "fifo-size 4 no-output test-bytes "
+ "fifo-size 4k test-bytes "
"tls-engine 1 "
"syn-timeout 2 uri " + uri
)
diff --git a/test/test_udp.py b/test/test_udp.py
index a026b04..19bac74 100644
--- a/test/test_udp.py
+++ b/test/test_udp.py
@@ -746,17 +746,15 @@
# Start builtin server and client
uri = "udp://" + self.loop0.local_ip4 + "/1234"
- error = self.vapi.cli(
- "test echo server appns 0 fifo-size 4 no-echo" + "uri " + uri
- )
+ error = self.vapi.cli("test echo server appns 0 fifo-size 4k " + "uri " + uri)
if error:
self.logger.critical(error)
self.assertNotIn("failed", error)
error = self.vapi.cli(
"test echo client mbytes 10 appns 1 "
- + "fifo-size 4 no-output test-bytes "
- + "syn-timeout 2 no-return uri "
+ + "fifo-size 4k "
+ + "syn-timeout 2 uri "
+ uri
)
if error: