make test: Fix too wide subprocess exceptions
When a command fails, CalledProcessError is raised. testing with except: masks other failures. Change-Id: I7e3a6739411cb6a4c13e96dd123aff9159213fea Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:

committed by
Ole Trøan

parent
c2b4dc5981
commit
61e63bf4e1
@ -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
|
||||
|
||||
|
@ -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))
|
||||
|
@ -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!")
|
||||
|
Reference in New Issue
Block a user