Updates

Author: TimSVector

generate_lcov.py

@@ -1,7 +1,7 @@
 #
 # The MIT License
 #
-# Copyright 2020 Vector Informatik, GmbH.
+# Copyright 2025 Vector Informatik, GmbH.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,12 +28,14 @@
     from vector.apps.DataAPI.vcproject_models import VCProject
 except:
     pass
+
+from vector.apps.DataAPI.cover_api import CoverApi
+
 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

generate_pclp_reports.py

@@ -243,7 +243,6 @@ def generate_source():
         print("XXX If you'd like to see the Source Code section of the PC-Line Report, please upgrade VectorCAST")
         sys.exit(0)
 
-
     fullMpName = globalState.fullMpName
     msgs = globalState.msgs
 

generate_sonarqube_testresults.py

@@ -47,9 +47,10 @@
 except:
     pass
 
+from vector.apps.DataAPI.cover_api import CoverApi
+
 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:

getjobs.py

@@ -230,10 +230,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)
@@ -250,8 +248,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)

patch_rgw_directory.py

@@ -42,7 +42,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()
 
@@ -64,7 +64,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)

prevcast_parallel_build_execute.py

@@ -124,7 +124,7 @@ def parseParallelExecuteArgs(self):
             sys.exit()
 
         if not os.path.isfile(self.manageProject) and not os.path.isfile(self.manageProject + ".vcm"):
-            raise IOError(self.manageProject + ' does not exist')
+            raise FileNotFoundError(self.manageProject + ' does not exist')
             return
 
         if args.incremental:

send_cobertura_to_bitbucket.py

@@ -1,9 +1,9 @@
 import requests
 import xml.etree.ElementTree as ET
 
-import os, sys
+import os, sys, glob
 import json
-from vcast_utils import checkVectorCASTVersion
+from vcast_utils import checkVectorCASTVersion, getVectorCASTEncoding
 
 if not checkVectorCASTVersion(20, quiet = False):
     if __name__ != "__main__":
@@ -350,7 +350,7 @@ def moveFiles(html_base_dir, verbose = False):
                 print("Error copying {} --> {}\n{}".format(html, dest, e))
 
 
-def run(fullMp, minimum_passing_coverage, useCi, html_base_dir, source_root, verbose):
+def run(fullMP, minimum_passing_coverage, useCi, html_base_dir, source_root, verbose):
 
     if not checkVectorCASTVersion(21):
         print("Cannot create Cobertura metrics to send to BitBucket. Please upgrade VectorCAST")
@@ -371,7 +371,7 @@ def run(fullMp, minimum_passing_coverage, useCi, html_base_dir, source_root, ver
 
         print("Generating and sending extended cobertura metrics to BitBucket")
         cobertura.generateCoverageResults(
-            fullMp,
+            fullMP,
             azure = False,
             xml_data_dir = "coverage",
             verbose = verbose,
@@ -380,7 +380,7 @@ def run(fullMp, minimum_passing_coverage, useCi, html_base_dir, source_root, ver
 
         print("Creating JUnit metrics to be read by BitBucket")
         failed_count, passed_count = generate_results.buildReports(
-                FullManageProjectName = fullMp,
+                FullManageProjectName = fullMP,
                 level = None,
                 envName = None,
                 generate_individual_reports = False,
@@ -393,7 +393,7 @@ def run(fullMp, minimum_passing_coverage, useCi, html_base_dir, source_root, ver
                 xml_data_dir = "test-results",
                 useStartLine = False)
 
-        name  = os.path.splitext(os.path.basename(fullMp))[0] + ".xml"
+        name  = os.path.splitext(os.path.basename(fullMP))[0] + ".xml"
         fname = os.path.join("coverage","cobertura","coverage_results_" + name)
 
         if os.path.exists(fname):
@@ -404,7 +404,7 @@ def run(fullMp, minimum_passing_coverage, useCi, html_base_dir, source_root, ver
         print("\nProcessing {} and sending to BitBucket: ".format(fname))
 
         buildAndSendCoverage(
-            fullMp,
+            fullMP,
             filename = fname,
             minimum_passing_coverage = minimum_passing_coverage,
             verbose = verbose
@@ -436,13 +436,6 @@ def run(fullMp, minimum_passing_coverage, useCi, html_base_dir, source_root, ver
         default=80
     )
 
-    parser.add_argument(
-        "-v", "--verbose",
-        action="store_true",
-        help="Enable verbose output for debugging or detailed reporting",
-        default = False
-    )
-
     parser.add_argument(
         "--ci",
         action="store_true",
@@ -471,10 +464,15 @@ def run(fullMp, minimum_passing_coverage, useCi, html_base_dir, source_root, ver
 
     args = parser.parse_args()
 
+    if args.ci:
+        useCi = "--ci"
+    else:
+        useCi = ""
+        
     run(
-        mpName = args.vcProject, 
+        fullMP = args.vcProject, 
         minimum_passing_coverage = args.minimum_passing_coverage, 
-        useCi = args.ci,
+        useCi = useCi,
         html_base_dir = args.html_base_dir,
         source_root = args.source_root,
         verbose = args.verbose

test_import.py

@@ -63,9 +63,7 @@
     import generate_sonarqube_testresults
     import generate_xml
     import getjobs
-    if checkVectorCASTVersion(21):
-        import incremental_build_report_aggregator
-    
+    import incremental_build_report_aggregator
     import managewait
     import merge_vcr
     import patch_rgw_directory

vcast_exec.py

@@ -128,7 +128,6 @@ def __init__(self, args):
 
         self.html_base_dir = args.html_base_dir
         self.use_cte = args.use_cte
-        self.minimum_passing_coverage = args.minimum_passing_coverage
         self.noIndex = args.noindex
 
         if args.exit_with_failed_count == 'not present':