From ff5a9b6ecd744ff5c42e6c2388dd31a338ea6a0c Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Wed, 25 Sep 2019 17:58:24 -0400 Subject: hsa: fix vpp_echo session close - Convert asserts in vpp_echo to conditional checks - Refactor error logging for session creation/deletion - Fix session close anomalies - Fix ECHO_* macros - Add rx/tx results different cmdline options to specify pass when counters are different - Update close tests to send more than the fifo sizes of data - Specify rx/tx results diff options for early close tests - Set listen session state to closed on handling unlisten reply Type: fix Signed-off-by: Dave Wallace Change-Id: I9d0075fcb18e20829f420da104d69523897b0552 --- src/plugins/quic/test/test_quic.py | 84 +++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 37 deletions(-) (limited to 'src/plugins/quic/test') diff --git a/src/plugins/quic/test/test_quic.py b/src/plugins/quic/test/test_quic.py index 0516dc7ceb6..79e5dd1f896 100644 --- a/src/plugins/quic/test/test_quic.py +++ b/src/plugins/quic/test/test_quic.py @@ -231,8 +231,8 @@ class QUICEchoExtQcloseRxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_qclose_rx(self): - self.server("TX=0", "RX=1Kb", "qclose=Y", "sclose=N") - self.client("TX=1Kb", "RX=0", "qclose=W", "sclose=W") + self.server("TX=0", "RX=10Mb", "qclose=Y", "sclose=N") + self.client("TX=10Mb", "RX=0", "qclose=W", "sclose=W") self.validate_ext_test_results() @@ -241,8 +241,9 @@ class QUICEchoExtQcloseTxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_qclose_tx(self): - self.server("TX=0", "RX=1Kb", "qclose=W", "sclose=W") - self.client("TX=1Kb", "RX=0", "qclose=Y", "sclose=N") + self.server("TX=0", "RX=10Mb", "qclose=W", "sclose=W", + "rx-results-diff") + self.client("TX=10Mb", "RX=0", "qclose=Y", "sclose=N") self.validate_ext_test_results() @@ -251,8 +252,9 @@ class QUICEchoExtEarlyQcloseRxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_early_qclose_rx(self): - self.server("TX=0", "RX=1Kb", "qclose=Y", "sclose=N") - self.client("TX=2Kb", "RX=0", "qclose=W", "sclose=W") + self.server("TX=0", "RX=10Mb", "qclose=Y", "sclose=N") + self.client("TX=20Mb", "RX=0", "qclose=W", "sclose=W", + "tx-results-diff") self.validate_ext_test_results() @@ -261,8 +263,9 @@ class QUICEchoExtEarlyQcloseTxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_early_qclose_tx(self): - self.server("TX=0", "RX=2Kb", "qclose=W", "sclose=W") - self.client("TX=1Kb", "RX=0", "qclose=Y", "sclose=N") + self.server("TX=0", "RX=20Mb", "qclose=W", "sclose=W", + "rx-results-diff") + self.client("TX=10Mb", "RX=0", "qclose=Y", "sclose=N") self.validate_ext_test_results() @@ -271,8 +274,8 @@ class QUICEchoExtScloseRxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_sclose_rx(self): - self.server("TX=0", "RX=1Kb", "qclose=N", "sclose=Y") - self.client("TX=1Kb", "RX=0", "qclose=W", "sclose=W") + self.server("TX=0", "RX=10Mb", "qclose=N", "sclose=Y") + self.client("TX=10Mb", "RX=0", "qclose=W", "sclose=W") self.validate_ext_test_results() @@ -281,8 +284,8 @@ class QUICEchoExtScloseTxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_sclose_tx(self): - self.server("TX=0", "RX=1Kb", "qclose=W", "sclose=W") - self.client("TX=1Kb", "RX=0", "qclose=N", "sclose=Y") + self.server("TX=0", "RX=10Mb", "qclose=W", "sclose=W") + self.client("TX=10Mb", "RX=0", "qclose=Y", "sclose=Y") self.validate_ext_test_results() @@ -291,18 +294,20 @@ class QUICEchoExtEarlyScloseRxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_early_sclose_rx(self): - self.server("TX=0", "RX=1Kb", "qclose=N", "sclose=Y") - self.client("TX=2Kb", "RX=0", "qclose=W", "sclose=W") + self.server("TX=0", "RX=10Mb", "qclose=N", "sclose=Y") + self.client("TX=20Mb", "RX=0", "qclose=W", "sclose=W", + "tx-results-diff") self.validate_ext_test_results() class QUICEchoExtEarlyScloseTxTestCase(QUICEchoExtTestCase): - """QUIC Echo External Transfer Early Sclose RTx Test Case""" + """QUIC Echo External Transfer Early Sclose Tx Test Case""" @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_early_sclose_tx(self): - self.server("TX=0", "RX=2Kb", "qclose=W", "sclose=W") - self.client("TX=1Kb", "RX=0", "qclose=N", "sclose=Y") + self.server("TX=0", "RX=20Mb", "qclose=W", "sclose=W", + "rx-results-diff") + self.client("TX=10Mb", "RX=0", "qclose=Y", "sclose=Y") self.validate_ext_test_results() @@ -311,8 +316,8 @@ class QUICEchoExtServerStreamTestCase(QUICEchoExtTestCase): quic_setup = "serverstream" def test_quic_ext_transfer_server_stream(self): - self.server("TX=1Kb", "RX=0") - self.client("TX=0", "RX=1Kb") + self.server("TX=10Mb", "RX=0") + self.client("TX=0", "RX=10Mb") self.validate_ext_test_results() @@ -322,8 +327,8 @@ class QUICEchoExtServerStreamQcloseRxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_server_stream_qclose_rx(self): - self.server("TX=1Kb", "RX=0", "qclose=W", "sclose=W") - self.client("TX=0", "RX=1Kb", "qclose=Y", "sclose=N") + self.server("TX=10Mb", "RX=0", "qclose=W", "sclose=W") + self.client("TX=0", "RX=10Mb", "qclose=Y", "sclose=N") self.validate_ext_test_results() @@ -333,8 +338,9 @@ class QUICEchoExtServerStreamQcloseTxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_server_stream_qclose_tx(self): - self.server("TX=1Kb", "RX=0", "qclose=Y", "sclose=N") - self.client("TX=0", "RX=1Kb", "qclose=W", "sclose=W") + self.server("TX=10Mb", "RX=0", "qclose=Y", "sclose=N") + self.client("TX=0", "RX=10Mb", "qclose=W", "sclose=W", + "rx-results-diff") self.validate_ext_test_results() @@ -344,8 +350,9 @@ class QUICEchoExtServerStreamEarlyQcloseRxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_server_stream_early_qclose_rx(self): - self.server("TX=2Kb", "RX=0", "qclose=W", "sclose=W") - self.client("TX=0", "RX=1Kb", "qclose=Y", "sclose=N") + self.server("TX=20Mb", "RX=0", "qclose=W", "sclose=W", + "tx-results-diff") + self.client("TX=0", "RX=10Mb", "qclose=Y", "sclose=N") self.validate_ext_test_results() @@ -355,8 +362,9 @@ class QUICEchoExtServerStreamEarlyQcloseTxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_server_stream_early_qclose_tx(self): - self.server("TX=1Kb", "RX=0", "qclose=Y", "sclose=N") - self.client("TX=0", "RX=2Kb", "qclose=W", "sclose=W") + self.server("TX=10Mb", "RX=0", "qclose=Y", "sclose=N") + self.client("TX=0", "RX=20Mb", "qclose=W", "sclose=W", + "rx-results-diff") self.validate_ext_test_results() @@ -366,8 +374,8 @@ class QUICEchoExtServerStreamScloseRxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_server_stream_sclose_rx(self): - self.server("TX=1Kb", "RX=0", "qclose=W", "sclose=W") - self.client("TX=0", "RX=1Kb", "qclose=N", "sclose=Y") + self.server("TX=10Mb", "RX=0", "qclose=W", "sclose=W") + self.client("TX=0", "RX=10Mb", "qclose=N", "sclose=Y") self.validate_ext_test_results() @@ -377,8 +385,8 @@ class QUICEchoExtServerStreamScloseTxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_server_stream_sclose_tx(self): - self.server("TX=1Kb", "RX=0", "qclose=N", "sclose=Y") - self.client("TX=0", "RX=1Kb", "qclose=W", "sclose=W") + self.server("TX=10Mb", "RX=0", "qclose=Y", "sclose=Y") + self.client("TX=0", "RX=10Mb", "qclose=W", "sclose=W") self.validate_ext_test_results() @@ -388,8 +396,9 @@ class QUICEchoExtServerStreamEarlyScloseRxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_server_stream_early_sclose_rx(self): - self.server("TX=2Kb", "RX=0", "qclose=W", "sclose=W") - self.client("TX=0", "RX=1Kb", "qclose=N", "sclose=Y") + self.server("TX=20Mb", "RX=0", "qclose=W", "sclose=W", + "tx-results-diff") + self.client("TX=0", "RX=10Mb", "qclose=N", "sclose=Y") self.validate_ext_test_results() @@ -399,8 +408,9 @@ class QUICEchoExtServerStreamEarlyScloseTxTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_server_stream_early_sclose_tx(self): - self.server("TX=1Kb", "RX=0", "qclose=N", "sclose=Y") - self.client("TX=0", "RX=2Kb", "qclose=W", "sclose=W") + self.server("TX=10Mb", "RX=0", "qclose=Y", "sclose=Y") + self.client("TX=0", "RX=20Mb", "qclose=W", "sclose=W", + "rx-results-diff") self.validate_ext_test_results() @@ -410,8 +420,8 @@ class QUICEchoExtServerStreamWorkersTestCase(QUICEchoExtTestCase): @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_quic_ext_transfer_server_stream_multi_workers(self): - self.server("nclients", "4/4", "TX=1Kb", "RX=0") - self.client("nclients", "4/4", "TX=0", "RX=1Kb") + self.server("nclients", "4/4", "TX=10Mb", "RX=0") + self.client("nclients", "4/4", "TX=0", "RX=10Mb") self.validate_ext_test_results() -- cgit 1.2.3-korg