aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKlement Sekera <ksekera@cisco.com>2016-12-02 07:05:24 +0100
committerDamjan Marion <dmarion.lists@gmail.com>2016-12-02 14:20:29 +0000
commit0529a743cc1299920cccbf4d445a904e954d6565 (patch)
tree565477b84345f84bc74d79b15ea8238bb08668c7
parentbeb4bf7df82658e556a20891cfa04ce375ddb435 (diff)
make test: handle exceptions from VppPapiProvider.__init__
Change-Id: I3c0372d5d09d554ad4ebe0adfa97c111571f628a Signed-off-by: Klement Sekera <ksekera@cisco.com>
-rw-r--r--test/framework.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/test/framework.py b/test/framework.py
index 315556a8833..5a9aba2c16a 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -186,12 +186,12 @@ class VppTestCase(unittest.TestCase):
try:
cls.run_vpp()
cls.vpp_stdout_queue = Queue()
- cls.vpp_stdout_reader_thread = Thread(
- target=pump_output, args=(cls.vpp.stdout, cls.vpp_stdout_queue))
+ cls.vpp_stdout_reader_thread = Thread(target=pump_output, args=(
+ cls.vpp.stdout, cls.vpp_stdout_queue))
cls.vpp_stdout_reader_thread.start()
cls.vpp_stderr_queue = Queue()
- cls.vpp_stderr_reader_thread = Thread(
- target=pump_output, args=(cls.vpp.stderr, cls.vpp_stderr_queue))
+ cls.vpp_stderr_reader_thread = Thread(target=pump_output, args=(
+ cls.vpp.stderr, cls.vpp_stderr_queue))
cls.vpp_stderr_reader_thread.start()
cls.vapi = VppPapiProvider(cls.shm_prefix, cls.shm_prefix)
if cls.step:
@@ -210,11 +210,12 @@ class VppTestCase(unittest.TestCase):
"to 'continue' VPP from within gdb?", RED))
raise
except:
+ t, v, tb = sys.exc_info()
try:
cls.quit()
except:
pass
- raise
+ raise t, v, tb
@classmethod
def quit(cls):
@@ -231,7 +232,8 @@ class VppTestCase(unittest.TestCase):
" and finish running the testcase...")
if hasattr(cls, 'vpp'):
- cls.vapi.disconnect()
+ if hasattr(cls, 'vapi'):
+ cls.vapi.disconnect()
cls.vpp.poll()
if cls.vpp.returncode is None:
cls.vpp.terminate()