Updates for added raise steps to do version protection.

Author: TimSVector

src/main/resources/scripts/cobertura.py

@@ -26,9 +26,9 @@
 try:
     from vector.apps.DataAPI.vcproject_api import VCProjectApi 
     from vector.apps.DataAPI.vcproject_models import VCProject
+    from vector.apps.DataAPI.cover_api import CoverApi
 except:
     pass
-from vector.apps.DataAPI.cover_api import CoverApi
 try:
     from vector.apps.DataAPI.unit_test_api import UnitTestApi
 except:
@@ -768,7 +768,8 @@ def generateCoverageResults(inFile, azure = False, xml_data_dir = "xml_data", ve
 if __name__ == '__main__':
 
     if not checkVectorCASTVersion(21):
-        raise ImportError ("Cannot create Cobertura metrics. Please upgrade VectorCAST")
+        print ("Cannot create Cobertura metrics. Please upgrade VectorCAST")
+        sys.exit(0)
 
     parser = argparse.ArgumentParser()
     parser.add_argument('ManageProject',     help='Manager Project Name')

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

@@ -507,7 +507,7 @@ def buildReports(FullManageProjectName = None,
 
    # make sure the project exists
     if not os.path.isfile(FullManageProjectName) and not os.path.isfile(FullManageProjectName + ".vcm"):
-        raise IOError(FullManageProjectName + ' does not exist')
+        raise FileNotFoundError(FullManageProjectName + ' does not exist')
         return
 
     manageProjectName = os.path.splitext(os.path.basename(FullManageProjectName))[0]

src/main/resources/scripts/generate_lcov.py

@@ -26,14 +26,14 @@
 try:
     from vector.apps.DataAPI.vcproject_api import VCProjectApi 
     from vector.apps.DataAPI.vcproject_models import VCProject
+    from vector.apps.DataAPI.cover_api import CoverApi
 except:
     pass
 try:
     from vector.apps.DataAPI.unit_test_api import UnitTestApi
 except:
     from vector.apps.DataAPI.api import Api as UnitTestApi
 
-from vector.apps.DataAPI.cover_api import CoverApi
 import sys, os
 from collections import defaultdict
 from pprint import pprint
@@ -346,7 +346,8 @@ def generateCoverageResults(inFile, xml_data_dir = "xml_data", verbose = False,
 if __name__ == '__main__':
 
     if not checkVectorCASTVersion(21):
-        raise ImportError("Cannot create LCOV metrics. Please upgrade VectorCAST")
+        print("Cannot create LCOV metrics. Please upgrade VectorCAST")
+        sys.exit(0)
 
     parser = argparse.ArgumentParser()
     parser.add_argument('vcProjectName', help='VectorCAST Project Name', action="store")

src/main/resources/scripts/generate_sonarqube_testresults.py

@@ -45,12 +45,12 @@
 
 try:
     from vector.apps.DataAPI.vcproject_api import VCProjectApi
+    from vector.apps.DataAPI.cover_api import CoverApi
 except:
     pass
 
 from vector.enums import ENVIRONMENT_STATUS_TYPE_T
 
-from vector.apps.DataAPI.cover_api import CoverApi
 try:
     from vector.apps.ReportBuilder.custom_report import fmt_percent
 except:

src/main/resources/scripts/generate_xml.py

@@ -44,10 +44,10 @@
 
 try:
     from vector.apps.DataAPI.vcproject_api import VCProjectApi
+    from vector.apps.DataAPI.cover_api import CoverApi
 except:
     pass
 
-from vector.apps.DataAPI.cover_api import CoverApi
 try:
     from vector.apps.ReportBuilder.custom_report import fmt_percent
 except:

src/main/resources/scripts/getjobs.py

@@ -227,10 +227,8 @@ def printEnvInfoNoDataAPI(ManageProjectName, printData = True, printEnvType = Fa
 
     return output
 
-def printEnvironmentInfo(ManageProjectName, printData = True, printEnvType = False, legacy = False):
+def printEnvironmentInfo(ManageProjectName, printData = True, printEnvType = False):
     try:
-        if (legacy): raise KeyError
-        
         from vector.apps.DataAPI.vcproject_api import VCProjectApi
         with VCProjectApi(ManageProjectName) as vcproj:
             ret_info = printEnvInfoDataAPI(vcproj, printData, printEnvType)
@@ -246,8 +244,7 @@ def printEnvironmentInfo(ManageProjectName, printData = True, printEnvType = Fal
     parser = argparse.ArgumentParser()
     parser.add_argument('ManageProject', help='Manager Project Name')
     parser.add_argument('-t', '--type',   help='Displays the type of environemnt (Unit test or System test)', action="store_true", default = False)    
-    parser.add_argument('-l', '--legacy',   help='Use the legacy report parsing method - testing only)', action="store_true", default = False)    
 
     args = parser.parse_args()
 
-    printEnvironmentInfo(args.ManageProject, True, args.type, args.legacy)
+    printEnvironmentInfo(args.ManageProject, True, args.type)

src/main/resources/scripts/incremental_build_report_aggregator.py

@@ -189,7 +189,7 @@ def log(msg, level="info"):
                     log("[INFO] Retrying parse with original encoding fallback.")
 
             if len(main_soup.find_all('table')) < 1:
-                raise Exception("No <table> elements found in {}".format(current_file))
+                raise LookupError("No <table> elements found in {}".format(current_file))
 
             if main_soup.find(id="report-title"):
                 main_manage_api_report = True

src/main/resources/scripts/parallel_full_reports.py

@@ -31,8 +31,13 @@
 
 encFmt = getVectorCASTEncoding()
 
-if not checkVectorCASTVersion(20, quiet = True):
-    raise ImportError("Full reports generated by previous call to generate-results.py")
+if not checkVectorCASTVersion(20, quiet = False):
+    if __name__ != "__main__":
+        raise ImportError("Full reports generated by previous call to generate-results.py")
+    else:
+        print("Full reports generated by previous call to generate-results.py")
+        sys.exit(0)
+        
 else:
     import multiprocessing
     from vector.apps.DataAPI.unit_test_api import UnitTestApi

src/main/resources/scripts/parse_traceback.py

@@ -61,6 +61,6 @@ def parse(tb, print_exc = False, compiler = "Compiler" , testsuite = "TestSuite"
 
     import traceback
     try:
-        raise TypeError
+        raise UserWarning("This is a test warning")
     except:
         parse(traceback.format_exc(), False, "Compiler" , "testsuite",  "env", "build_dir")

src/main/resources/scripts/patch_rgw_directory.py

@@ -19,7 +19,7 @@ def getReqRepo(VC_Manage_Project):
             break
 
     if reqRepoDir is None:
-        raise("Requirements Repository Directory not set")
+        raise EnvironmentError("Requirements Repository Directory not set")
 
     reqRepoDir = reqRepoDir.replace("\\","/").strip()
 
@@ -41,7 +41,7 @@ def updateReqRepo(VC_Manage_Project, VC_Workspace, top_level):
         newPath = os.path.join(VC_Workspace, reqRepoDir.replace(basePath,"")).replace("\\","/")      
 
         if not os.path.exists(newPath): 
-            raise Exception("Patch ReqRepo Path " + newPath + " not found")
+            raise FileNotFoundError("Patch ReqRepo Path " + newPath + " not found")
 
         command_line= "--project \"" + VC_Manage_Project + "\" --config VCAST_REPOSITORY=\"" + newPath + "\""
         manageWait = ManageWait(False, command_line, 30, 1)