[Core] Improve the try part.
Improve the readability of the block try. It's more easy to maintain the block when this contain only the line can be raise. Change-Id: I5024aecec41955b7cd5e0fe48ea4c6a0a7d6e293
This commit is contained in:
parent
314fe55026
commit
235b73aea9
|
@ -139,6 +139,11 @@ class BugVerifyCmd(object):
|
||||||
try:
|
try:
|
||||||
with open(self.args.skip_file) as f:
|
with open(self.args.skip_file) as f:
|
||||||
skip = yaml.safe_load(f)
|
skip = yaml.safe_load(f)
|
||||||
|
except yaml.constructor.ConstructorError:
|
||||||
|
LOG.error('Invalid yaml file {}'.format(self.args.skip_file))
|
||||||
|
except IOError:
|
||||||
|
LOG.error('File not found {}'.format(self.args.skip_file))
|
||||||
|
else:
|
||||||
for t in skip.get('known_failures'):
|
for t in skip.get('known_failures'):
|
||||||
bug = {'test': t.get('test'), 'reason': t.get('reason')}
|
bug = {'test': t.get('test'), 'reason': t.get('reason')}
|
||||||
if t.get('lp'):
|
if t.get('lp'):
|
||||||
|
@ -146,12 +151,8 @@ class BugVerifyCmd(object):
|
||||||
if t.get('bz'):
|
if t.get('bz'):
|
||||||
bug['bz'] = t.get('bz')
|
bug['bz'] = t.get('bz')
|
||||||
known_failures.append(bug)
|
known_failures.append(bug)
|
||||||
except yaml.constructor.ConstructorError:
|
|
||||||
LOG.error('Invalid yaml file {}'.format(self.args.skip_file))
|
return known_failures
|
||||||
except IOError:
|
|
||||||
LOG.error('File not found {}'.format(self.args.skip_file))
|
|
||||||
finally:
|
|
||||||
return known_failures
|
|
||||||
|
|
||||||
def _print_yaml(self, known_failures):
|
def _print_yaml(self, known_failures):
|
||||||
return yaml.dump({'known_failures': known_failures},
|
return yaml.dump({'known_failures': known_failures},
|
||||||
|
|
|
@ -318,15 +318,14 @@ class TempestMailCmd(object):
|
||||||
known_failures = []
|
known_failures = []
|
||||||
try:
|
try:
|
||||||
skip = yaml.safe_load(open(self.args.skip_file))
|
skip = yaml.safe_load(open(self.args.skip_file))
|
||||||
|
except yaml.constructor.ConstructorError:
|
||||||
|
self.log.error('Invalid yaml file {}'.format(self.args.skip_file))
|
||||||
|
else:
|
||||||
for t in skip.get('known_failures'):
|
for t in skip.get('known_failures'):
|
||||||
known_failures.append({'test': t.get('test'),
|
known_failures.append({'test': t.get('test'),
|
||||||
'reason': t.get('reason')})
|
'reason': t.get('reason')})
|
||||||
except yaml.constructor.ConstructorError:
|
|
||||||
self.log.error('Invalid yaml file {}'.format(self.args.skip_file))
|
return known_failures
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
finally:
|
|
||||||
return known_failures
|
|
||||||
|
|
||||||
def checkJobs(self):
|
def checkJobs(self):
|
||||||
data = []
|
data = []
|
||||||
|
@ -388,8 +387,8 @@ class TempestMailCmd(object):
|
||||||
'reason': t.get('reason')})
|
'reason': t.get('reason')})
|
||||||
|
|
||||||
if self.args.skip_file:
|
if self.args.skip_file:
|
||||||
known_failures = \
|
known_failures = (
|
||||||
(known_failures + self.load_skip_file(self.args.skip_file))
|
known_failures + self.load_skip_file(self.args.skip_file))
|
||||||
|
|
||||||
newconfig.known_failures = known_failures
|
newconfig.known_failures = known_failures
|
||||||
newconfig.api_server = config.get('api_server')
|
newconfig.api_server = config.get('api_server')
|
||||||
|
|
Loading…
Reference in New Issue