seperating vcast_exec.py from send_cobertura_to_bitbutcket.py

Author: TimSVector

cobertura.py

@@ -23,12 +23,17 @@
 #
 
 from lxml import etree
+
+from vcast_utils import dump, checkVectorCASTVersion, getVectorCASTEncoding
+
 try:
     from vector.apps.DataAPI.vcproject_api import VCProjectApi 
     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:
@@ -44,8 +49,6 @@
 
 fileList = []
 
-from vcast_utils import dump, checkVectorCASTVersion, getVectorCASTEncoding
-
 encFmt = getVectorCASTEncoding()
 
 def write_xml(x, name, verbose = False):
@@ -768,9 +771,8 @@ def generateCoverageResults(inFile, azure = False, xml_data_dir = "xml_data", ve
 if __name__ == '__main__':
 
     if not checkVectorCASTVersion(21):
-        print("Cannot create Cobertura metrics. Please upgrade VectorCAST")
-        sys.modules[__name__] = None
-
+        print ("Cannot create Cobertura metrics. Please upgrade VectorCAST")
+        sys.exit(0)
 
     parser = argparse.ArgumentParser()
     parser.add_argument('ManageProject',     help='Manager Project Name')

generate_lcov.py

@@ -347,7 +347,7 @@ def generateCoverageResults(inFile, xml_data_dir = "xml_data", verbose = False,
 
     if not checkVectorCASTVersion(21):
         print("Cannot create LCOV metrics. Please upgrade VectorCAST")
-        sys.modules[__name__] = None
+        sys.exit(0)
 
     parser = argparse.ArgumentParser()
     parser.add_argument('vcProjectName', help='VectorCAST Project Name', action="store")

generate_metrics_md.py

@@ -22,7 +22,17 @@
 # THE SOFTWARE.
 #
 
+from vcast_utils import checkVectorCASTVersion
+
 import sys, io, re, os
+
+if not checkVectorCASTVersion(20, quiet = False):
+    if __name__ != "__main__":
+        raise ImportError("Cannot generate metrics with DataApi. Please upgrade VectorCAST")
+    else:
+        print("Cannot generate metrics with DataApi. Please upgrade VectorCAST")
+        sys.exit(0)
+
 from vector.apps.ReportBuilder.custom_report import CustomReport
 from vector.apps.DataAPI.vcproject_api import VCProjectApi
 

generate_pclp_reports.py

@@ -241,7 +241,8 @@ def generate_source():
         print("XXX Cannot generate Source Code section of the PC-Line Report report")
         print("XXX The Summary and File Detail sections are present")
         print("XXX If you'd like to see the Source Code section of the PC-Line Report, please upgrade VectorCAST")
-        sys.modules[__name__] = None
+        sys.exit(0)
+
 
     fullMpName = globalState.fullMpName
     msgs = globalState.msgs