summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
ca68912)
Issue-ID: VVP-225
Signed-off-by: Lovett, Trevor (tl2972) <tl2972@att.com>
Change-Id: Iebee13d29f8025b3dd5c147f2024a484789464f7
# Extract everything between AssertionError and the start
# of the assert statement expansion in the pytest report
msg = match.group(1)
# Extract everything between AssertionError and the start
# of the assert statement expansion in the pytest report
msg = match.group(1)
+ elif "AssertionError:" in full_msg:
+ msg = full_msg.split("AssertionError:")[1]
- msg = str(rep.longrepr.reprcrash)
- if "AssertionError:" in msg:
- msg = msg.split("AssertionError:")[1]
except AttributeError:
msg = str(rep)
except AttributeError:
msg = str(rep)
worksheet.write(row, 0, str(err_num), normal)
worksheet.write(row, 1, "\n".join(failure.files), normal)
worksheet.write(row, 2, failure.requirement_text(reqs), normal)
worksheet.write(row, 0, str(err_num), normal)
worksheet.write(row, 1, "\n".join(failure.files), normal)
worksheet.write(row, 2, failure.requirement_text(reqs), normal)
- worksheet.write(row, 3, failure.error_message, normal)
+ worksheet.write(row, 3, failure.error_message.replace("\n", "\n\n"), normal)
worksheet.write(row, 4, failure.test_id, normal)
err_num += 1
worksheet.autofilter(
worksheet.write(row, 4, failure.test_id, normal)
err_num += 1
worksheet.autofilter(
{
"file_links": make_href(failure.files, template_path),
"test_id": failure.test_id,
{
"file_links": make_href(failure.files, template_path),
"test_id": failure.test_id,
- "error_message": failure.error_message,
+ "error_message": failure.error_message.replace("\n", "<br/><br/>"),
"raw_output": failure.raw_output,
"requirements": docutils.core.publish_parts(
writer_name="html", source=failure.requirement_text(reqs)
"raw_output": failure.raw_output,
"requirements": docutils.core.publish_parts(
writer_name="html", source=failure.requirement_text(reqs)
""" environment file structure
"""
import os
""" environment file structure
"""
import os
+from collections import Iterable
from tests.structures import Heat
from tests.utils import nested_dict
from tests.structures import Heat
from tests.utils import nested_dict
if kwargs.get("resource_type_inverse"):
resource_type = "non-{}".format(resource_type)
if kwargs.get("resource_type_inverse"):
resource_type = "non-{}".format(resource_type)
+ params = (
+ ": {}".format(", ".join(invalid_parameters))
+ if isinstance(invalid_parameters, Iterable)
+ else ""
+ )
+
assert not invalid_parameters, (
"{} {} parameters in template {}{}"
assert not invalid_parameters, (
"{} {} parameters in template {}{}"
- " found in {} environment file: {}".format(
+ " found in {} environment file{}".format(
resource_type,
prop,
filename,
" not" if DESIRED else "",
environment_pair.get("name"),
resource_type,
prop,
filename,
" not" if DESIRED else "",
environment_pair.get("name"),
- ", ".join(invalid_parameters),