From e2ccdf0316243a1486109743e3de532cae5f3254 Mon Sep 17 00:00:00 2001 From: Paul Vinciguerra Date: Mon, 2 Dec 2019 13:40:33 -0500 Subject: papi: add a per-call _timeout option add the ability to override the default timeout value on a per-call basis. Use: rv = self.vapi.papi.cli_inband(cmd='wait 10', _timeout=15) Type: feature Change-Id: Ia90a58586a1f63e02118599a2a4b7141e5a0b90d Signed-off-by: Paul Vinciguerra --- src/vpp-api/python/vpp_papi/vpp_transport_socket.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/vpp-api/python/vpp_papi/vpp_transport_socket.py') diff --git a/src/vpp-api/python/vpp_papi/vpp_transport_socket.py b/src/vpp-api/python/vpp_papi/vpp_transport_socket.py index c146c7b9386..d6431ca8c52 100644 --- a/src/vpp-api/python/vpp_papi/vpp_transport_socket.py +++ b/src/vpp-api/python/vpp_papi/vpp_transport_socket.py @@ -225,10 +225,12 @@ class VppTransport(object): return msg raise VppTransportSocketIOError(1, 'Unknown socket read error') - def read(self): + def read(self, timeout=None): if not self.connected: raise VppTransportSocketIOError(1, 'Not connected') + if timeout is None: + timeout = self.read_timeout try: - return self.q.get(True, self.read_timeout) + return self.q.get(True, timeout) except queue.Empty: return None -- cgit 1.2.3-korg