"""
text = (
"\n\n{}: \n{}".format(r_id, curr_reqs[r_id]["description"])
- for r_id in self.requirement_ids
+ for r_id in self.requirement_ids if r_id in curr_reqs
)
return "".join(text)
elif "yaml_files" in self.item.fixturenames:
return self.item.funcargs["yaml_files"]
else:
- return [self.result.nodeid.split("[")[1][:-1]]
+ parts = self.result.nodeid.split("[")
+ return [""] if len(parts) == 1 else [parts[1][:-1]]
def _get_error_message(self):
"""
return [e for e in errors if e]
+def relative_paths(base_dir, paths):
+ return [os.path.relpath(p, base_dir) for p in paths]
+
+
def generate_json(outpath, template_path, categories):
"""
Creates a JSON summary of the entire test run.
reqs = load_current_requirements()
data = {
"version": "dublin",
- "template_directory": template_path,
+ "template_directory": os.path.splitdrive(template_path)[1].replace(
+ os.path.sep, "/"
+ ),
"timestamp": make_iso_timestamp(),
"checksum": hash_directory(template_path),
"categories": categories,
for result in ALL_RESULTS:
results.append(
{
- "files": result.files,
+ "files": relative_paths(template_path, result.files),
"test_module": result.test_module,
"test_case": result.test_case,
"result": result.outcome,
def select_heat_requirements(reqs):
"""Filters dict requirements to only those requirements pertaining to Heat"""
- return {k: v for k, v in reqs.items() if "Heat" in v["docname"]}
+ return {k: v for k, v in reqs.items() if "heat" in v["docname"].lower()}
def build_rst_json(reqs):
if "none" in (values["validation_mode"]):
del data[key]
else:
- """Creates links in RST format to requirements and test cases"""
+ # Creates links in RST format to requirements and test cases
if values["test_case"]:
- val_list = re.findall(r'(?<=\.).*', values["test_case"])
- val = TEST_SCRIPT_SITE + val_list[0] + ".py"
- rst_value = ("`" + val_list[0] + " <" + val + ">`_")
+ mod = values["test_case"].split(".")[-1]
+ val = TEST_SCRIPT_SITE + mod + ".py"
+ rst_value = ("`" + mod + " <" + val + ">`_")
title = "`" + values["id"] + " <" + VNFRQTS_ID_URL + values["docname"].replace(" ", "%20") + ".html#" + values["id"] + ">`_"
data[key].update({'full_title': title, 'test_case': rst_value})
else:
if req_id not in req_to_test:
req_to_test[req_id].add(item)
if req_id in requirements:
- reqs[req_id].update({'test_case': item.function.__module__, 'validated_by': item.function.__name__})
+ reqs[req_id].update({'test_case': item.function.__module__,
+ 'validated_by': item.function.__name__})
if req_id not in requirements:
mapping_errors.add(
(req_id, item.function.__module__, item.function.__name__)
""), # test function
)
# now write out any test methods that weren't mapped to requirements
- unmapped_tests = {(item.function.__module__, item.function.__name__)
- for item in unmapped}
+ unmapped_tests = {(item.function.__module__, item.function.__name__) for item in
+ unmapped}
for test_module, test_name in unmapped_tests:
out.writerow(
("", # req ID