From: Steven Wright <sw3588@att.com>
Date: Tue, 20 Aug 2019 17:22:38 +0000 (+0000)
Subject: Merge "[VVP] Adding preload generation functionality"
X-Git-Tag: 5.0.0~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=commitdiff_plain;h=2b57f73aad5c0a6755a7dfddc7e79937a74de00f;hp=-c

Merge "[VVP] Adding preload generation functionality"
---

2b57f73aad5c0a6755a7dfddc7e79937a74de00f
diff --combined ice_validator/tests/conftest.py
index 7fe9443,f4b3857..2507753
--- a/ice_validator/tests/conftest.py
+++ b/ice_validator/tests/conftest.py
@@@ -43,6 -43,10 +43,10 @@@ import jso
  import os
  import re
  import time
+ 
+ from preload import create_preloads
+ from tests.helpers import get_output_dir
+ 
  try:
      from html import escape
  except ImportError:
@@@ -95,18 -99,6 +99,6 @@@ COLLECTION_FAILURES = [
  ALL_RESULTS = []
  
  
- def get_output_dir(config):
-     """
-     Retrieve the output directory for the reports and create it if necessary
-     :param config: pytest configuration
-     :return: output directory as string
-     """
-     output_dir = config.option.output_dir or DEFAULT_OUTPUT_DIR
-     if not os.path.exists(output_dir):
-         os.makedirs(output_dir, exist_ok=True)
-     return output_dir
- 
- 
  def extract_error_msg(rep):
      """
      If a custom error message was provided, then extract it otherwise
@@@ -352,6 -344,12 +344,12 @@@ def pytest_sessionfinish(session, exits
      )
  
  
+ def pytest_terminal_summary(terminalreporter, exitstatus):
+     # Ensures all preload information and warnings appear after
+     # test results
+     create_preloads(terminalreporter.config, exitstatus)
+ 
+ 
  # noinspection PyUnusedLocal
  def pytest_collection_modifyitems(session, config, items):
      """
@@@ -749,8 -747,9 +747,9 @@@ def generate_html_report(outpath, categ
              {
                  "file_links": make_href(failure.files, template_path),
                  "test_id": failure.test_id,
-                 "error_message": escape(failure.error_message).replace("\n",
-                                                                        "<br/><br/>"),
+                 "error_message": escape(failure.error_message).replace(
+                     "\n", "<br/><br/>"
+                 ),
                  "raw_output": escape(failure.raw_output),
                  "requirements": docutils.core.publish_parts(
                      writer_name="html", source=failure.requirement_text(reqs)
@@@ -1045,11 -1044,12 +1044,11 @@@ def generate_rst_table(output_dir, data
      rst_path = os.path.join(output_dir, "rst.csv")
      with open(rst_path, "w", newline="") as f:
          out = csv.writer(f)
 -        out.writerow(("Requirement ID", "Requirement", "Test Module", "Test Name"))
 +        out.writerow(("Requirement ID", "Test Module", "Test Name"))
          for req_id, metadata in data.items():
              out.writerow(
                  (
                      metadata["full_title"],
 -                    metadata["description"],
                      metadata["test_case"],
                      metadata["validated_by"],
                  )