X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_session.py;h=94218d08e8e8470609ce78c3a40ff026715d3462;hb=b4e5e50fe;hp=5f4f3f5cfba81d191537d31dec3893cd5d21ce7e;hpb=e1ade684eb5a7e5743abfda47488165452cc5b64;p=vpp.git diff --git a/test/test_session.py b/test/test_session.py index 5f4f3f5cfba..94218d08e8e 100644 --- a/test/test_session.py +++ b/test/test_session.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import unittest @@ -13,6 +13,10 @@ class TestSession(VppTestCase): def setUpClass(cls): super(TestSession, cls).setUpClass() + @classmethod + def tearDownClass(cls): + super(TestSession, cls).tearDownClass() + def setUp(self): super(TestSession, self).setUp() @@ -68,14 +72,14 @@ class TestSession(VppTestCase): "private-segment-size 1m uri " + uri) if error: self.logger.critical(error) - self.assertEqual(error.find("failed"), -1) + self.assertNotIn("failed", error) error = self.vapi.cli("test echo client nclients 100 appns 1 " + "no-output fifo-size 64 syn-timeout 2 " + "private-segment-size 1m uri " + uri) if error: self.logger.critical(error) - self.assertEqual(error.find("failed"), -1) + self.assertNotIn("failed", error) if self.vpp_dead: self.assert_equal(0) @@ -88,6 +92,14 @@ class TestSession(VppTestCase): class TestSessionUnitTests(VppTestCase): """ Session Unit Tests Case """ + @classmethod + def setUpClass(cls): + super(TestSessionUnitTests, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(TestSessionUnitTests, cls).tearDownClass() + def setUp(self): super(TestSessionUnitTests, self).setUp() self.vapi.session_enable_disable(is_enabled=1) @@ -98,11 +110,37 @@ class TestSessionUnitTests(VppTestCase): if error: self.logger.critical(error) - self.assertEqual(error.find("failed"), -1) + self.assertNotIn("failed", error) def tearDown(self): super(TestSessionUnitTests, self).tearDown() self.vapi.session_enable_disable(is_enabled=0) + +class TestSvmFifoUnitTests(VppTestCase): + """ SVM Fifo Unit Tests Case """ + + @classmethod + def setUpClass(cls): + super(TestSvmFifoUnitTests, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(TestSvmFifoUnitTests, cls).tearDownClass() + + def setUp(self): + super(TestSvmFifoUnitTests, self).setUp() + + def test_svm_fifo(self): + """ SVM Fifo Unit Tests """ + error = self.vapi.cli("test svm fifo all") + + if error: + self.logger.critical(error) + self.assertNotIn("failed", error) + + def tearDown(self): + super(TestSvmFifoUnitTests, self).tearDown() + if __name__ == '__main__': unittest.main(testRunner=VppTestRunner)