aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/framework.py2
-rw-r--r--test/test_jvpp.py2
-rw-r--r--test/test_vcl.py6
3 files changed, 5 insertions, 5 deletions
diff --git a/test/framework.py b/test/framework.py
index 3c4aacb6354..c29346bf56c 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -348,7 +348,7 @@ class VppTestCase(unittest.TestCase):
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
bufsize=1)
- except Exception as e:
+ except subprocess.CalledProcessError as e:
cls.logger.critical("Couldn't start vpp: %s" % e)
raise
diff --git a/test/test_jvpp.py b/test/test_jvpp.py
index 36dbdb2b391..6151ebdbb20 100644
--- a/test/test_jvpp.py
+++ b/test/test_jvpp.py
@@ -135,7 +135,7 @@ class TestJVpp(VppTestCase):
self.logger.info("Process output : {0}{1}".format(os.linesep, out))
if self.process.returncode != 0:
- raise Exception(
+ raise subprocess.CalledProcessError(
"Command {0} failed with return code: {1}.{2}"
"Process error output: {2}{3}"
.format(command, self.process.returncode, os.linesep, err))
diff --git a/test/test_vcl.py b/test/test_vcl.py
index fb358b7a1e9..6027ba75e7d 100644
--- a/test/test_vcl.py
+++ b/test/test_vcl.py
@@ -251,7 +251,7 @@ class VCLCutThruTestCase(VCLTestCase):
try:
subprocess.check_output(['iperf3', '-v'])
- except:
+ except subprocess.CalledProcessError:
self.logger.error("WARNING: 'iperf3' is not installed,")
self.logger.error(" 'test_ldp_cut_thru_iperf3' not run!")
return
@@ -496,7 +496,7 @@ class VCLThruHostStackIperfTestCase(VCLTestCase):
try:
subprocess.check_output(['iperf3', '-v'])
- except:
+ except subprocess.CalledProcessError:
self.logger.error("WARNING: 'iperf3' is not installed,")
self.logger.error(
" 'test_ldp_thru_host_stack_iperf3' not run!")
@@ -811,7 +811,7 @@ class VCLIpv6ThruHostStackIperfTestCase(VCLTestCase):
try:
subprocess.check_output(['iperf3', '-v'])
- except:
+ except subprocess.CalledProcessError:
self.logger.error("WARNING: 'iperf3' is not installed,")
self.logger.error(
" 'test_ldp_thru_host_stack_iperf3' not run!")