X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_quic.py;h=21f2fd730918ebe62cdd98c98381bd7a9adce4e5;hb=286921eef8aa07e9edd83078c0a8397d06dc448c;hp=aed34088e000a17364b1f32b590107992e057a9a;hpb=3bffd4be22c2eeb9177f1b30cad5a7a97528bde3;p=vpp.git

diff --git a/test/test_quic.py b/test/test_quic.py
index aed34088e00..21f2fd73091 100644
--- a/test/test_quic.py
+++ b/test/test_quic.py
@@ -157,7 +157,7 @@ class QUICTestCase(VppTestCase):
                 raise
         if error:
             raise Exception(
-                "Timeout! Client worker did not finish in %ss" % timeout)
+                "Timeout! Client worker did not finish in %ss" % self.timeout)
         self.assert_equal(self.worker_client.result, 0,
                           "Binary test return code")
 
@@ -178,8 +178,8 @@ class QUICInternalEchoIPv4TestCase(QUICTestCase):
         self.thru_host_stack_ipv4_setup()
 
     def tearDown(self):
-        self.thru_host_stack_ipv4_tear_down()
         super(QUICInternalEchoIPv4TestCase, self).tearDown()
+        self.thru_host_stack_ipv4_tear_down()
 
     def show_commands_at_teardown(self):
         self.logger.debug(self.vapi.cli("show session verbose 2"))
@@ -193,6 +193,42 @@ class QUICInternalEchoIPv4TestCase(QUICTestCase):
                                          ["no-output", "mbytes", "10"])
 
 
+class QUICInternalSerialEchoIPv4TestCase(QUICTestCase):
+    """ QUIC Internal Serial Echo IPv4 Transfer Test Cases """
+
+    @classmethod
+    def setUpClass(cls):
+        super(QUICInternalSerialEchoIPv4TestCase, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(QUICInternalSerialEchoIPv4TestCase, cls).tearDownClass()
+
+    def setUp(self):
+        super(QUICInternalSerialEchoIPv4TestCase, self).setUp()
+        self.thru_host_stack_ipv4_setup()
+
+    def tearDown(self):
+        super(QUICInternalSerialEchoIPv4TestCase, self).tearDown()
+        self.thru_host_stack_ipv4_tear_down()
+
+    def show_commands_at_teardown(self):
+        self.logger.debug(self.vapi.cli("show session verbose 2"))
+
+    @unittest.skipUnless(running_extended_tests, "part of extended tests")
+    def test_quic_serial_internal_transfer(self):
+        """ QUIC serial internal echo client/server transfer """
+
+        client_args = (self.client_echo_test_args +
+                       ["no-output", "mbytes", "10"])
+        self.internal_ipv4_transfer_test(self.server_echo_test_args,
+                                         client_args)
+        self.start_internal_echo_client(client_args)
+        self.start_internal_echo_client(client_args)
+        self.start_internal_echo_client(client_args)
+        self.start_internal_echo_client(client_args)
+
+
 class QUICInternalEchoIPv4MultiStreamTestCase(QUICTestCase):
     """ QUIC Internal Echo IPv4 Transfer Test Cases """
 
@@ -209,8 +245,8 @@ class QUICInternalEchoIPv4MultiStreamTestCase(QUICTestCase):
         self.thru_host_stack_ipv4_setup()
 
     def tearDown(self):
-        self.thru_host_stack_ipv4_tear_down()
         super(QUICInternalEchoIPv4MultiStreamTestCase, self).tearDown()
+        self.thru_host_stack_ipv4_tear_down()
 
     def show_commands_at_teardown(self):
         self.logger.debug(self.vapi.cli("show session verbose 2"))
@@ -229,6 +265,11 @@ class QUICInternalEchoIPv4MultiStreamTestCase(QUICTestCase):
 class QUICExternalEchoIPv4TestCase(QUICTestCase):
     """ QUIC External Echo IPv4 Transfer Test Cases """
 
+    @classmethod
+    def setUpConstants(cls):
+        super(QUICExternalEchoIPv4TestCase, cls).setUpConstants()
+        cls.vpp_cmdline.extend(["session", "{", "evt_qs_memfd_seg", "}"])
+
     @classmethod
     def setUpClass(cls):
         super(QUICExternalEchoIPv4TestCase, cls).setUpClass()
@@ -253,10 +294,11 @@ class QUICExternalEchoIPv4TestCase(QUICTestCase):
         """ QUIC external echo client/server transfer """
 
         self.external_ipv4_transfer_test(self.server_echo_test_args +
-                                         ["socket-name", self.api_sock],
+                                         ["socket-name", self.api_sock,
+                                          "server"],
                                          self.client_echo_test_args +
                                          ["socket-name", self.api_sock,
-                                          "mbytes", "10"])
+                                          "client", "mbytes", "10"])
 
 
 if __name__ == '__main__':