tests: handle removed interface

[vpp.git] / test / test_cli.py

diff --git a/test/test_cli.py b/test/test_cli.py
index 7fa734b..5005bf4 100644 (file)
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -5,7 +5,7 @@ import datetime
 import time
 import unittest
 
-from vpp_papi import vpp_transport_shmem
+from vpp_papi import VPPIOError
 
 from framework import VppTestCase, VppTestRunner
 
@@ -17,7 +17,7 @@ class TestCLI(VppTestCase):
     @classmethod
     def setUpClass(cls):
         # using the framework default
-        # cls.vapi_response_timeout = 5
+        cls.vapi_response_timeout = 5
         super(TestCLI, cls).setUpClass()
 
     @classmethod
@@ -39,11 +39,15 @@ class TestCLI(VppTestCase):
         self.assertEqual(rv.retval, 0)
 
     def test_long_cli_delay(self):
-        """ Test that VppApiClient raises VppTransportShmemIOError if timeout."""  # noqa
-        with self.assertRaises(
-                vpp_transport_shmem.VppTransportShmemIOError) as ctx:
+        """ Test that VppApiClient raises VppIOError if timeout."""  # noqa
+        with self.assertRaises(VPPIOError) as ctx:
             rv = self.vapi.papi.cli_inband(cmd='wait 10')
 
+    def test_long_cli_delay_override(self):
+        """ Test per-command _timeout option."""  # noqa
+        rv = self.vapi.papi.cli_inband(cmd='wait 10', _timeout=15)
+        self.assertEqual(rv.retval, 0)
+
 
 class TestCLIExtendedVapiTimeout(VppTestCase):
     maxDiff = None