openstack/nova
Code Issues Proposed changes

Merge "Provide a better error when _verify_response hits a TypeError"

Browse Source
This commit is contained in:
Zuul
2019-11-13 15:27:53 +00:00
committed by Gerrit Code Review
parent 1e348cfcd1 021749a734
commit e3b3ebed2b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/functional/api_samples_test_base.py
View File

@@ -245,7 +245,15 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase):
expected = expected % self.subs expected = expected % self.subs
expected = '^%s$' % expected expected = '^%s$' % expected
try:
match = re.match(expected, result) match = re.match(expected, result)
except TypeError as e:
raise NoMatch(
'Values do not match:\n'
'Template: %(expected)s\n%(result_str)s: %(result)s\n'
'Error: %(error)s' %
{'expected': expected, 'result_str': result_str,
'result': result, 'error': e})
if not match: if not match:
raise NoMatch( raise NoMatch(
'Values do not match:\n' 'Values do not match:\n'