updates from testing

Author: TimSVector

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

@@ -539,7 +539,7 @@ def buildReports(FullManageProjectName = None, level = None, envName = None, gen
             api.close()
         except:
             teePrint.teePrint("   *INFO: Issue getting tool version from: " + FullManageProjectName)
-            traceback.print_exc()
+            if print_exc:  traceback.print_exc()
             use_manage_api = False
 
         if use_manage_api:

src/main/resources/scripts/generate_sonarqube_testresults.py

@@ -603,7 +603,7 @@ def generate_unit(self):
                         for func in unit.functions:
                             if not func.is_non_testable_stub:
                                 for tc in func.testcases:
-                                    if not isTcPlaceHolder(tc):
+                                    if not self.isTcPlaceHolder(tc):
                                         if not tc.for_compound_only or tc.testcase_status == "TCR_STRICT_IMPORT_FAILED":
                                             self.write_testcase(tc, tc.function.unit.name, tc.function.display_name)
 

src/main/resources/scripts/generate_xml.py

@@ -815,14 +815,52 @@ def generate_local_results(self, results, key):
             report_name = os.path.join("management", comp + "_" + ts + "_" + env_name + ".html")
             try:
                 if isinstance(localXML.api, CoverApi):
-                    localXML.api.report(report_type="AGGREGATE_REPORT", formats=["HTML"], output_file=report_name)
+                    try:
+                        localXML.api.report(report_type="AGGREGATE_REPORT", formats=["HTML"], output_file=report_name)
+                    except:
+                        print("Failed to create " + report_name + " by CustomReport API. Using clicast directly")
+                        self.runAggregateReport(comp, ts, env_name, report_name)
                 else:
-                    localXML.api.report(report_type="FULL_REPORT", formats=["HTML"], output_file=report_name)
+                    try:
+                        localXML.api.report(report_type="FULL_REPORT", formats=["HTML"], output_file=report_name)
+                    except:
+                        print("Failed to create " + report_name + " by CustomReport API. Using clicast directly")
+                        self.runFullReport(comp, ts, env_name, report_name)
                 self.fixupReport(report_name)
             except:
                 print("Error creating report", report_name + ". Contact Vector Support")
                 parse_traceback.parse(traceback.format_exc(), self.verbose, self.compiler,  self.testsuite,  self.env,  self.build_dir)
 
+    def runFullReport(self,comp,ts,env_name,report_name):
+        try:
+            from managewait import ManageWait
+            cmd_prefix = os.environ.get('VECTORCAST_DIR') + os.sep
+            callStr = cmd_prefix + "manage --project " + self.FullManageProjectName + " --level " + comp + "/" + ts + " --environment " + env_name + " --clicast-args report custom full"
+            print("   ", callStr)
+            manageWait = ManageWait(False, callStr, 1, 1)
+            out = manageWait.exec_manage(True)
+            for line in out.split("\n"):
+                if "The HTML report was saved to" in line:
+                    fname = line.split("\"")[1]
+            import shutil
+            shutil.copyfile(fname, report_name)
+        except:
+            traceback.print_exc()
+    def runAggregateReport(self,comp,ts,env_name,report_name):
+        try:
+            from managewait import ManageWait
+            cmd_prefix = os.environ.get('VECTORCAST_DIR') + os.sep
+            callStr = cmd_prefix + "manage --project " + self.FullManageProjectName + " --level " + comp + "/" + ts + " --environment " + env_name + " --clicast-args cover report aggregate"
+            print("   ", callStr)
+            manageWait = ManageWait(False, callStr, 1, 1)
+            out = manageWait.exec_manage(True)
+            for line in out.split("\n"):
+                if "The HTML report was saved to" in line:
+                    fname = line.split("\"")[1]
+            import shutil
+            shutil.copyfile(fname, report_name)
+        except:
+            traceback.print_exc()
     def skipReporting(self, env):
 
         build_dir = ""
@@ -1272,7 +1310,14 @@ def write_testcase(self, tc, unit_name, func_name, st_is_monitored = False, unit
                 fpath = filePath
 
             if self.useStartLine:
-                startLine = str(tc.function.start_line)
+                try:
+                    startLine = str(tc.function.start_line)
+                except:
+                    try:
+                        startLine = list(tc.cover_data.covered_statements)[0].start_line
+                    except:
+                        startLine = "0"
+                        print("failed to access any start_line ", self.env, func_name, tc.name)
             else:
                 startLine = "0"