adding debug back in, changing stuff for system-status-repoert

Author: TimSVector

src/main/resources/scripts/cobertura.py

@@ -393,10 +393,16 @@ def procesCoverage(coverXML, coverApi, extended = False, source_root = ""):
 
 def runCoverageResultsMP(packages, mpFile, verbose = False, extended=False, source_root = ""):
 
+    print("[DEBUG] Opening vcproj in copy_build_dir::getVcastProjectWorkspace")
     vcproj = VCProjectApi(mpFile)
+    print("[DEBUG] Opened  vcproj in copy_build_dir::getVcastProjectWorkspace")
+
     api = vcproj.project.cover_api    
     results = runCoberturaResults(packages, api, verbose = False, extended = extended, source_root = source_root)
+
+    print("[DEBUG] Closing vcproj in copy_build_dir::getVcastProjectWorkspace")
     vcproj.close()
+    print("[DEBUG] Closed  vcproj in copy_build_dir::getVcastProjectWorkspace")
 
     return results
 

src/main/resources/scripts/copy_build_dir.py

@@ -244,9 +244,15 @@ def run(ManageProjectName, Level, BaseName, Env, workspace, vCastProjectWorkspac
 
 def getVcastProjectWorkspace(args):
 
-    api = VCProjectApi(args.ManageProject)
-    vCastProjectWorkspace = api.project.workspace
-    api.close()
+    print("[DEBUG] Opening vcproj in copy_build_dir::getVcastProjectWorkspace")
+    vcproj = VCProjectApi(args.ManageProject)
+    print("[DEBUG] Opened  vcproj in copy_build_dir::getVcastProjectWorkspace")
+    
+    vCastProjectWorkspace = vcproj.project.workspace
+    
+    print("[DEBUG] Closing vcproj in copy_build_dir::getVcastProjectWorkspace")
+    vcproj.close()
+    print("[DEBUG] Closed  vcproj in copy_build_dir::getVcastProjectWorkspace")
 
     return vCastProjectWorkspace
 

src/main/resources/scripts/create_index_html.py

@@ -103,7 +103,9 @@ def create_index_html(mpName, isGitLab = False, output_dir = ""):
     global baseOutputDir
     baseOutputDir = output_dir
 
+    print("[DEBUG] Opening vcproj in create_index_html::create_index_html")
     vcproj = VCProjectApi(mpName)
+    print("[DEBUG] Opened  vcproj in create_index_html::create_index_html")
 
     # Set custom report directory to the where this script was
     # found. Must contain sections/index_section.py
@@ -120,8 +122,10 @@ def create_index_html(mpName, isGitLab = False, output_dir = ""):
             sections=['CUSTOM_HEADER', 'REPORT_TITLE', 'TABLE_OF_CONTENTS','INDEX_SECTION', 'CUSTOM_FOOTER'],
             customization_dir=rep_path)
 
+    print("[DEBUG] Closing vcproj in create_index_html::create_index_html")
     vcproj.close()
-    
+    print("[DEBUG] Closed  vcproj in create_index_html.::create_index_html")
+   
 def create_index_html_body ():
 
     tempHtmlReportList =  glob.glob(os.path.join(baseOutputDir,"*.html"))

src/main/resources/scripts/generate-results.py

@@ -541,13 +541,17 @@ def buildReports(FullManageProjectName = None,
         print("Cleanup: " + str(time.time()))
     if useNewReport and not legacy:
         try:
+            print("[DEBUG] Opening vcproj in generate-results::buildReports")
             vcproj = VCProjectApi(FullManageProjectName)
+            print("[DEBUG] Opened  vcproj in generate-results::buildReports")
             tool_version = vcproj.tool_version
             if tool_version.startswith("20"):
                 use_manage_api = False
             else:
                 use_manage_api = True
+            print("[DEBUG] Closing vcproj in generate-results::buildReports")
             vcproj.close()
+            print("[DEBUG] Closed  vcproj in generate-results::buildReports")
         except:
             use_manage_api = False
 

src/main/resources/scripts/generate_lcov.py

@@ -144,10 +144,16 @@ def get_function_name_line_number(file_path, function, initial_guess):
 
 def runCoverageResultsMP(mpFile, verbose = False, testName = "", source_root = ""):
 
+    print("[DEBUG] Opening vcproj in generate_lcov::generate_html_report")
     vcproj = VCProjectApi(mpFile)
+    print("[DEBUG] Opened  vcproj in generate_lcov::generate_html_report")
+    
     api = vcproj.project.cover_api
     results = runGcovResults(api, verbose = verbose, testName = vcproj.project.name, source_root=source_root)
+    
+    print("[DEBUG] Closing vcproj in generate_lcov::generate_html_report")
     vcproj.close()
+    print("[DEBUG] Closed  vcproj in generate_lcov::generate_html_report")
 
     return results
 

src/main/resources/scripts/generate_pclp_reports.py

@@ -339,7 +339,9 @@ def generate_html_report(mpName, input_xml, output_html):
     if output_html is None:
         output_html = "pclp_findings.html"
 
+    print("[DEBUG] Opening vcproj in generate_pclp_reports::generate_html_report")
     vcproj = VCProjectApi(mpName)
+    print("[DEBUG] Opened  self.api in generate_pclp_reports::generate_html_report")
 
     # Set custom report directory to the where this script was
     # found. Must contain sections/index_section.py
@@ -353,7 +355,9 @@ def generate_html_report(mpName, input_xml, output_html):
             sections=['CUSTOM_HEADER', 'REPORT_TITLE', 'TABLE_OF_CONTENTS','PCLP_SUMMARY_SECTION','PCLP_DETAILS_SECTION','PCLP_SOURCE_SECTION', 'CUSTOM_FOOTER'],
             customization_dir=rep_path)
 
+    print("[DEBUG] Closing vcproj in generate_pclp_reports::generate_html_report")
     vcproj.close()
+    print("[DEBUG] Closed  vcproj in generate_pclp_reports::generate_html_report")
 
 def has_any_coverage(line):
 

src/main/resources/scripts/generate_sonarqube_testresults.py

@@ -259,7 +259,9 @@ def __init__(self, FullManageProjectName, verbose = False,
 
         super(GenerateManageXml, self).__init__(FullManageProjectName, verbose, xml_data_dir)
 
+        print("[DEBUG] Opening self.api in generate_sonarqube_testresults::GenerateManageXml::__init__")
         self.api = VCProjectApi(FullManageProjectName)
+        print("[DEBUG] Opened  self.api in generate_sonarqube_testresults::GenerateManageXml::__init__")
 
         self.FullManageProjectName = FullManageProjectName        
         self.generate_exec_rpt_each_testcase = generate_exec_rpt_each_testcase
@@ -279,7 +281,9 @@ def __init__(self, FullManageProjectName, verbose = False,
 
     def __del__(self):
         try:
+            print("[DEBUG] Closing self.api in generate_sonarqube_testresults::GenerateManageXml::__del__")
             self.api.close()
+            print("[DEBUG] Closed  self.api in generate_sonarqube_testresults::GenerateManageXml::__del__")
         except:
             pass
 
@@ -559,12 +563,14 @@ def generate_unit(self):
         if isinstance(self.api, CoverApi):
             try:
                 if self.topLevelAPI == None:
-
-                    api = VCProjectApi(self.FullManageProjectName)
+                    print("[DEBUG] Opening vcproj in generate_sonarqube_testresults::GenerateManageXml::generate_unit")
+                    vcproj = VCProjectApi(self.FullManageProjectName)
+                    print("[DEBUG] Opened  vcproj in generate_sonarqube_testresults::GenerateManageXml::generate_unit")
+                    
                 else:
-                    api = self.topLevelAPI
+                    vcproj = self.topLevelAPI
 
-                for env in api.Environment.all():
+                for env in vcproj.Environment.all():
                     if env.compiler.name == self.compiler and env.testsuite.name == self.testsuite and env.name == self.env and env.system_tests:
                         for st in env.system_tests:
                             pass_fail_rerun = ""
@@ -583,7 +589,9 @@ def generate_unit(self):
                             self.write_testcase(st, level, st.name, env.definition.is_monitored)
 
                 if self.topLevelAPI == None:
-                    api.close()
+                    print("[DEBUG] Closing vcproj in generate_sonarqube_testresults::GenerateManageXml::generate_unit")
+                    vcproj.close()
+                    print("[DEBUG] Closing vcproj in generate_sonarqube_testresults::GenerateManageXml::generate_unit")
 
             except ImportError as e:
                 from generate_qa_results_xml import genQATestResults