aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChore <s3m2e1.6star@gmail.com>2019-06-25 14:21:26 +0430
committerNeale Ranns <nranns@cisco.com>2019-06-25 11:52:26 +0000
commit464e1dcd6b219038c28ee8c71cc7247151a0d18c (patch)
tree38f4fef222df513b7ff479c9d2a5adc7ad5570e2
parent5dd6a7b29f23b89aaad4fdaba0579ca5b37d7929 (diff)
quic: test_quic.py style is fixed.
Type: test Change-Id: I943f95ef740a0646b2da363c6a16dff1f4a2bb83 Signed-off-by: Chore <s3m2e1.6star@gmail.com>
-rw-r--r--test/test_quic.py64
1 files changed, 49 insertions, 15 deletions
diff --git a/test/test_quic.py b/test/test_quic.py
index 2bcbcf3387e..490ed5ebcf8 100644
--- a/test/test_quic.py
+++ b/test/test_quic.py
@@ -28,7 +28,7 @@ class QUICAppWorker(Worker):
def teardown(self, logger, timeout):
if self.process is None:
- return False
+ return False
try:
logger.debug("Killing worker process (pid %d)" % self.process.pid)
os.killpg(os.getpgid(self.process.pid), signal.SIGKILL)
@@ -102,23 +102,30 @@ class QUICTestCase(VppTestCase):
class QUICEchoInternalTestCase(QUICTestCase):
"""QUIC Echo Internal Test Case"""
+
def setUp(self):
super(QUICEchoInternalTestCase, self).setUp()
- self.client_args = "uri %s fifo-size 64 test-bytes appns client" % self.uri
+ self.client_args = "uri %s fifo-size 64 test-bytes appns client" \
+ % self.uri
self.server_args = "uri %s fifo-size 64 appns server" % self.uri
def server(self, *args):
- error = self.vapi.cli("test echo server %s %s" % (self.server_args, ' '.join(args)))
+ error = self.vapi.cli(
+ "test echo server %s %s" %
+ (self.server_args, ' '.join(args)))
if error:
self.logger.critical(error)
self.assertNotIn("failed", error)
def client(self, *args):
- error = self.vapi.cli("test echo client %s %s" % (self.client_args, ' '.join(args)))
+ error = self.vapi.cli(
+ "test echo client %s %s" %
+ (self.client_args, ' '.join(args)))
if error:
self.logger.critical(error)
self.assertNotIn("failed", error)
+
class QUICEchoInternalTransferTestCase(QUICEchoInternalTestCase):
"""QUIC Echo Internal Transfer Test Case"""
@unittest.skipUnless(running_extended_tests, "part of extended tests")
@@ -126,6 +133,7 @@ class QUICEchoInternalTransferTestCase(QUICEchoInternalTestCase):
self.server()
self.client("no-output", "mbytes", "10")
+
class QUICEchoInternalSerialTestCase(QUICEchoInternalTestCase):
"""QUIC Echo Internal Serial Transfer Test Case"""
@unittest.skipUnless(running_extended_tests, "part of extended tests")
@@ -137,6 +145,7 @@ class QUICEchoInternalSerialTestCase(QUICEchoInternalTestCase):
self.client("no-output", "mbytes", "10")
self.client("no-output", "mbytes", "10")
+
class QUICEchoInternalMStreamTestCase(QUICEchoInternalTestCase):
"""QUIC Echo Internal MultiStream Test Case"""
@unittest.skipUnless(running_extended_tests, "part of extended tests")
@@ -151,38 +160,61 @@ class QUICEchoExternalTestCase(QUICTestCase):
def setUp(self):
super(QUICEchoExternalTestCase, self).setUp()
- common_args = ["uri", self.uri, "fifo-size", "64", "test-bytes:assert", "socket-name", self.api_sock]
- self.server_echo_test_args = common_args + ["server", "appns", "server", "quic-setup", self.quic_setup]
- self.client_echo_test_args = common_args + ["client", "appns", "client", "quic-setup", self.quic_setup]
+ common_args = [
+ "uri",
+ self.uri,
+ "fifo-size",
+ "64",
+ "test-bytes:assert",
+ "socket-name",
+ self.api_sock]
+ self.server_echo_test_args = common_args + \
+ ["server", "appns", "server", "quic-setup", self.quic_setup]
+ self.client_echo_test_args = common_args + \
+ ["client", "appns", "client", "quic-setup", self.quic_setup]
self.event = Event()
def server(self, *args):
_args = self.server_echo_test_args + list(args)
- self.worker_server = QUICAppWorker(self.build_dir, "quic_echo",
- _args, self.logger, event=self.event)
+ self.worker_server = QUICAppWorker(
+ self.build_dir,
+ "quic_echo",
+ _args,
+ self.logger,
+ event=self.event)
self.worker_server.start()
self.sleep(self.pre_test_sleep)
def client(self, *args):
_args = self.client_echo_test_args + list(args)
# self.client_echo_test_args += "use-svm-api"
- self.worker_client = QUICAppWorker(self.build_dir, "quic_echo",
- _args, self.logger, event=self.event)
+ self.worker_client = QUICAppWorker(
+ self.build_dir,
+ "quic_echo",
+ _args,
+ self.logger,
+ event=self.event)
self.worker_client.start()
self.event.wait(self.timeout)
self.sleep(self.post_test_sleep)
def validate_external_test_results(self):
- self.logger.info("Client worker result is `%s'" % self.worker_client.result)
+ self.logger.info(
+ "Client worker result is `%s'" %
+ self.worker_client.result)
server_result = self.worker_server.result
client_result = self.worker_client.result
server_kill_error = False
if self.worker_server.result is None:
- server_kill_error = self.worker_server.teardown(self.logger, self.timeout)
+ server_kill_error = self.worker_server.teardown(
+ self.logger, self.timeout)
if self.worker_client.result is None:
self.worker_client.teardown(self.logger, self.timeout)
self.assertIsNone(server_result, "Wrong server worker return code")
- self.assertIsNotNone(client_result, "Timeout! Client worker did not finish in %ss" % self.timeout)
+ self.assertIsNotNone(
+ client_result,
+ "Timeout! Client worker did not finish in %ss" %
+ self.timeout)
self.assertEqual(client_result, 0, "Wrong client worker return code")
self.assertFalse(server_kill_error, "Server kill errored")
@@ -195,6 +227,7 @@ class QUICEchoExternalTransferTestCase(QUICEchoExternalTestCase):
self.client()
self.validate_external_test_results()
+
class QUICEchoExternalServerStreamTestCase(QUICEchoExternalTestCase):
"""QUIC Echo External Transfer Server Stream Test Case"""
quic_setup = "serverstream"
@@ -202,9 +235,10 @@ class QUICEchoExternalServerStreamTestCase(QUICEchoExternalTestCase):
@unittest.skipUnless(running_extended_tests, "part of extended tests")
def test_quic_external_transfer_server_stream(self):
self.server("nclients", "1/1", "send", "1Kb", "recv", "0")
- self.client("nclients" ,"1/1", "send", "0", "recv", "1Kb")
+ self.client("nclients", "1/1", "send", "0", "recv", "1Kb")
self.validate_external_test_results()
+
class QUICEchoExternalServerStreamWorkersTestCase(QUICEchoExternalTestCase):
"""QUIC Echo External Transfer Server Stream MultiWorker Test Case"""
quic_setup = "serverstream"