Updates for error with teeprint

Author: TimSVector

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

@@ -231,7 +231,7 @@ def delete_file(filename):
     if os.path.exists(filename):
         os.remove(filename)
 
-def genDataApiReports(FullManageProjectName, entry, cbtDict, generate_exec_rpt_each_testcase, use_archive_extract, report_only_failures, useStartLine):
+def genDataApiReports(FullManageProjectName, entry, cbtDict, generate_exec_rpt_each_testcase, use_archive_extract, report_only_failures, useStartLine, teePrint):
     xml_file = ""
 
     try:
@@ -261,7 +261,8 @@ def genDataApiReports(FullManageProjectName, entry, cbtDict, generate_exec_rpt_e
                                use_archive_extract,
                                report_only_failures,
                                print_exc,
-                               useStartLine)
+                               useStartLine,
+                               teePrint)
 
         if xml_file.api != None:
             if verbose:
@@ -389,7 +390,7 @@ def generateIndividualReports(entry, envName):
 
 
 
-def useManageAPI(FullManageProjectName, cbtDict, generate_exec_rpt_each_testcase, use_archive_extract, report_only_failures, no_full_report, useStartLine):
+def useManageAPI(FullManageProjectName, cbtDict, generate_exec_rpt_each_testcase, use_archive_extract, report_only_failures, no_full_report, useStartLine, teePrint):
     global verbose
 
     print("Using VCProjectApi")
@@ -407,7 +408,7 @@ def useManageAPI(FullManageProjectName, cbtDict, generate_exec_rpt_each_testcase
                                report_only_failures,
                                no_full_report,
                                print_exc,
-                               useStartLine)
+                               useStartLine, teePrint)
 
         if xml_file.api != None:
             xml_file.generate_testresults()
@@ -433,7 +434,7 @@ def useManageAPI(FullManageProjectName, cbtDict, generate_exec_rpt_each_testcase
         return 0, 0
 
 
-def useNewAPI(FullManageProjectName, manageEnvs, level, envName, cbtDict, generate_exec_rpt_each_testcase, use_archive_extract, report_only_failures, no_full_report, useStartLine):
+def useNewAPI(FullManageProjectName, manageEnvs, level, envName, cbtDict, generate_exec_rpt_each_testcase, use_archive_extract, report_only_failures, no_full_report, useStartLine, teePrint):
 
     failed_count = 0 
     passed_count = 0
@@ -446,7 +447,7 @@ def useNewAPI(FullManageProjectName, manageEnvs, level, envName, cbtDict, genera
             continue 
 
         if envName == None:
-            pc, fc = genDataApiReports(FullManageProjectName, manageEnvs[currentEnv],  cbtDict, generate_exec_rpt_each_testcase,use_archive_extract, report_only_failures, useStartLine)
+            pc, fc = genDataApiReports(FullManageProjectName, manageEnvs[currentEnv],  cbtDict, generate_exec_rpt_each_testcase,use_archive_extract, report_only_failures, useStartLine, teePrint)
             passed_count += pc
             failed_count += fc
             if not no_full_report:
@@ -456,7 +457,7 @@ def useNewAPI(FullManageProjectName, manageEnvs, level, envName, cbtDict, genera
             env_level = manageEnvs[currentEnv]["compiler"] + "/" + manageEnvs[currentEnv]["testsuite"]
 
             if level == None or env_level.upper() == level.upper():
-                pc, fc = genDataApiReports(FullManageProjectName, manageEnvs[currentEnv], cbtDict, generate_exec_rpt_each_testcase,use_archive_extract, report_only_failures, useStartLine)
+                pc, fc = genDataApiReports(FullManageProjectName, manageEnvs[currentEnv], cbtDict, generate_exec_rpt_each_testcase,use_archive_extract, report_only_failures, useStartLine, teePrint)
                 passed_count += pc
                 failed_count += fc
 
@@ -482,7 +483,7 @@ def cleanupOldBuilds(teePrint):
 # def buildReports(FullManageProjectName = None, level = None, envName = None, generate_individual_reports = True, timing = False, cbtDict = None,use_archive_extract = False, report_only_failures = False, no_full_report = False):
 def buildReports(FullManageProjectName = None, level = None, envName = None, generate_individual_reports = True, 
         timing = False, cbtDict = None, use_archive_extract = False, 
-        report_only_failures = False, no_full_report = False, use_ci = "", xml_data_dir = "xml_data", useStartLine = False):
+        report_only_failures = False, no_full_report = False, use_ci = "", xml_data_dir = "xml_data", useStartLine = False, teePrint = None):
 
     if timing:
         print("Start report generation: " + str(time.time()))
@@ -506,8 +507,10 @@ def buildReports(FullManageProjectName = None, level = None, envName = None, gen
     if timing:
         print("Version Check: " + str(time.time()))
 
-    with tee_print.TeePrint() as teePrint:
-        cleanupOldBuilds(teePrint)
+    if teePrint is None:
+        teePrint = tee_print.TeePrint()
+            
+    cleanupOldBuilds(teePrint)
 
 
     for file in glob.glob("*.csv"):
@@ -535,7 +538,7 @@ def buildReports(FullManageProjectName = None, level = None, envName = None, gen
                 use_manage_api = True
             api.close()
         except:
-            teePrint.teePrint("   *INFO: iIssue getting tool version from: " + FullManageProjectName)
+            teePrint.teePrint("   *INFO: Issue getting tool version from: " + FullManageProjectName)
             traceback.print_exc()
             use_manage_api = False
 
@@ -544,16 +547,16 @@ def buildReports(FullManageProjectName = None, level = None, envName = None, gen
                     use_archive_extract, 
                     report_only_failures,
                     no_full_report,
-                    useStartLine)
+                    useStartLine,
+                    teePrint)
 
-            
         else:
 
             manageEnvs = getManageEnvs(FullManageProjectName)
             if timing:
                 print("Using DataAPI for reporting")
                 print("Get Info: " + str(time.time()))
-            passed_count, failed_count = useNewAPI(FullManageProjectName, manageEnvs, level, envName, cbtDict, generate_individual_reports, use_archive_extract, report_only_failures, no_full_report, useStartLine)
+            passed_count, failed_count = useNewAPI(FullManageProjectName, manageEnvs, level, envName, cbtDict, generate_individual_reports, use_archive_extract, report_only_failures, no_full_report, useStartLine, teePrint)
 
         with open("unit_test_fail_count.txt", "w") as fd:
             failed_str = str(failed_count)
@@ -868,7 +871,8 @@ def new_init(self):
     # Set VCAST_MANAGE_PROJECT_DIRECTORY to match .vcm directory
     os.environ['VCAST_MANAGE_PROJECT_DIRECTORY'] = os.path.abspath(args.ManageProject).rsplit(".",1)[0]
 
-    buildReports(args.ManageProject,args.level,args.environment,generate_individual_reports, timing, cbtDict, args.use_archive_extract, args.report_only_failures, args.no_full_report)
+    with tee_print.TeePrint() as teePrint:
+        buildReports(args.ManageProject,args.level,args.environment,generate_individual_reports, timing, cbtDict, args.use_archive_extract, args.report_only_failures, args.no_full_report, teePrint)
 
     import archive_extract_reports
 

src/main/resources/scripts/generate_xml.py

@@ -70,14 +70,15 @@ def dummy(*args, **kwargs):
 # (Emma based) report for Coverage
 #
 class BaseGenerateXml(object):
-    def __init__(self, FullManageProjectName, verbose):
+    def __init__(self, FullManageProjectName, verbose, teePrint):
         projectName = os.path.splitext(os.path.basename(FullManageProjectName))[0]
         self.manageProjectName = projectName
         self.cover_report_name = os.path.join("xml_data","coverage_results_"+ self.manageProjectName + ".xml")
         self.unit_report_name = os.path.join("xml_data","test_results_"+ self.manageProjectName + ".xml")
         self.verbose = verbose
         self.has_sfp_enabled = False
         self.print_exc = False
+        self.teePrint = teePrint
 
         # get the VC langaguge and encoding
         self.encFmt = 'utf-8'
@@ -95,6 +96,9 @@ def __init__(self, FullManageProjectName, verbose):
         self.env = ""
         self.build_dir = ""
 
+        if self.teePrint is None:
+            self.teePrint = tee_print.TeePrint()
+            self.teePrint.teePrint("BaseGenerateXml called incorrectly, no teePrint")
 #
 # BaseGenerateXml - calculate coverage value
 #
@@ -643,9 +647,10 @@ def __init__(self, FullManageProjectName, verbose = False,
                        report_failed_only = False,
                        no_full_reports = False,
                        print_exc = False,
-                       useStartLine = False):
+                       useStartLine = False,
+                       teePrint = None):
 
-        super(GenerateManageXml, self).__init__(FullManageProjectName, verbose)
+        super(GenerateManageXml, self).__init__(FullManageProjectName, verbose, teePrint)
         self.api = VCProjectApi(FullManageProjectName)
 
         try:
@@ -678,7 +683,7 @@ def cleanupXmlDataDir(self):
                 try:
                     os.remove(file);
                 except:
-                    teePrint.teePrint("   *INFO: File System Error removing file after failed to remove directory: " + path + "/" + file + ".  Check console for environment build/execution errors")
+                    self.teePrint.teePrint("   *INFO: File System Error removing file after failed to remove directory: " + path + "/" + file + ".  Check console for environment build/execution errors")
                     if print_exc:  traceback.print_exc()
 
         # we should either have an empty directory or no directory
@@ -687,7 +692,7 @@ def cleanupXmlDataDir(self):
                 os.mkdir(path)
             except:
                 print("failed making path: " + path)
-                teePrint.teePrint("   *INFO: File System Error creating directory: " + path + ".  Check console for environment build/execution errors")
+                self.teePrint.teePrint("   *INFO: File System Error creating directory: " + path + ".  Check console for environment build/execution errors")
                 if print_exc:  traceback.print_exc()
 
     def __del__(self):
@@ -794,7 +799,8 @@ def generate_local_results(self, results, key):
                                self.use_archive_extract,
                                self.report_failed_only,
                                self.print_exc,
-                               self.useStartLine)
+                               self.useStartLine,
+                               self.teePrint)
 
         localXML.topLevelAPI = self.api
         localXML.noResults = self.noResults
@@ -953,8 +959,8 @@ def generate_testresults(self):
 #
 class GenerateXml(BaseGenerateXml):
 
-    def __init__(self, FullManageProjectName, build_dir, env, compiler, testsuite, cover_report_name, jenkins_name, unit_report_name, jenkins_link, jobNameDotted, verbose = False, cbtDict= None, generate_exec_rpt_each_testcase = True, use_archive_extract = False, report_failed_only = False, print_exc = False, useStartLine = False):
-        super(GenerateXml, self).__init__(FullManageProjectName, verbose)
+    def __init__(self, FullManageProjectName, build_dir, env, compiler, testsuite, cover_report_name, jenkins_name, unit_report_name, jenkins_link, jobNameDotted, verbose = False, cbtDict= None, generate_exec_rpt_each_testcase = True, use_archive_extract = False, report_failed_only = False, print_exc = False, useStartLine = False, teePrint = None):
+        super(GenerateXml, self).__init__(FullManageProjectName, verbose, teePrint)
 
         self.cbtDict = cbtDict
         self.FullManageProjectName = FullManageProjectName
@@ -1487,19 +1493,19 @@ def __print_test_case_was_skipped(self, searchName, passed):
         if self.verbose:
             print("skipping ", self.hashCode, searchName, passed)
 
-def __generate_xml(xml_file, envPath, env, xmlCoverReportName, xmlTestingReportName, teePrint):
+def __generate_xml(xml_file, envPath, env, xmlCoverReportName, xmlTestingReportName):
     if xml_file.api == None:
-        teePrint.teePrint ("\nCannot find project file (.vcp or .vce): " + envPath + os.sep + env)
+        self.teePrint.teePrint ("\nCannot find project file (.vcp or .vce): " + envPath + os.sep + env)
 
     elif isinstance(xml_file, CoverApi):
         xml_file.generate_cover()
-        teePrint.teePrint ("\nvectorcast-coverage plugin for Jenkins compatible file generated: " + xmlCoverReportName)
+        self.teePrint.teePrint ("\nvectorcast-coverage plugin for Jenkins compatible file generated: " + xmlCoverReportName)
 
     else:
         xml_file.generate_unit()
-        teePrint.teePrint ("\nJunit plugin for Jenkins compatible file generated: " + xmlTestingReportName)
+        self.teePrint.teePrint ("\nJunit plugin for Jenkins compatible file generated: " + xmlTestingReportName)
         xml_file.generate_cover()
-        teePrint.teePrint ("\nVCC plugin for Jenkins compatible file generated: " + xmlTestingReportName)
+        self.teePrint.teePrint ("\nVCC plugin for Jenkins compatible file generated: " + xmlTestingReportName)
 
 if __name__ == '__main__':
 
@@ -1524,7 +1530,8 @@ def __generate_xml(xml_file, envPath, env, xmlCoverReportName, xmlTestingReportN
     xmlCoverReportName = "coverage_results_" + env + ".xml"
     xmlTestingReportName = "test_results_" + env + ".xml"
 
-    xml_file = GenerateXml(env,
+    with tee_print.TeePrint() as teePrint:
+        xml_file = GenerateXml(env,
                            envPath,
                            env, "", "",
                            xmlCoverReportName,
@@ -1533,13 +1540,12 @@ def __generate_xml(xml_file, envPath, env, xmlCoverReportName, xmlTestingReportN
                            jenkins_link,
                            jobNameDotted,
                            args.verbose,
-                           None)
+                           None,
+                           teePrint)
 
-    with tee_print.TeePrint() as teePrint:
         __generate_xml(
             xml_file,
             envPath,
             env,
             xmlCoverReportName,
-            xmlTestingReportName,
-            teePrint)
+            xmlTestingReportName)