updates

Author: TimSVector

send_cobertura_to_bitbucket.py

@@ -13,7 +13,7 @@
 PARTIAL = "🟡"
 
 # Parse Cobertura XML
-def parse_cobertura(xml_path):
+def parse_cobertura(xml_path, send_all_coverage):
     tree = ET.parse(xml_path)
     root = tree.getroot()
     annotations = []
@@ -28,39 +28,49 @@ def parse_cobertura(xml_path):
             mcdcpair_coverage = line.attrib.get('mcdcpair-coverage', '')
 
             summary = ""
+            
+            publishAnnotation = send_all_coverage
 
             if hits == 0:
                 summary = FAIL + " No coverage on line."
+                publishAnnotation = True
+                
             else:
                 summary = "ST: " + PASS
                 if branch == 'true':
                     if condition_coverage.startswith("100.0%"):
                         summary += " BR: {} {}".format (PASS,condition_coverage)
                     elif condition_coverage.startswith("0.0%"):
                         summary += " BR: {} {}".format (FAIL,condition_coverage)
+                        publishAnnotation = True
                     else:
                         summary += " BR: {} {}".format (PARTIAL,condition_coverage)
+                        publishAnnotation = True
 
                 if functioncall_coverage.startswith("100.0%"):
                     summary += " FC: {}".format (PASS)
                 elif functioncall_coverage != '':
                     summary += " FC: {}".format (FAIL)
+                    publishAnnotation = True
 
                 if mcdcpair_coverage.startswith("100.0%"):
                     summary += " MCDC: {} {}".format (PASS, mcdcpair_coverage)
                 elif mcdcpair_coverage.startswith("0.0%"):
                     summary += " MCDC: {} {}".format (FAIL, mcdcpair_coverage)
+                    publishAnnotation = True
                 elif mcdcpair_coverage != '':
                     summary += " MCDC: {} {}".format (PARTIAL, mcdcpair_coverage)
-
-            annotations.append({
-                "title": "Coverage",
-                "annotation_type": "COVERAGE",
-                "summary": summary,
-                "severity": "LOW",
-                "path": file_path,
-                "line": num,
-                "external_id": "{}#{}".format(file_path,num)
+                    publishAnnotation = True
+
+            if publishAnnotation:
+                annotations.append({
+                    "title": "Coverage",
+                    "annotation_type": "COVERAGE",
+                    "summary": summary,
+                    "severity": "LOW",
+                    "path": file_path,
+                    "line": num,
+                    "external_id": "{}#{}".format(file_path,num)
 
             })
     return annotations
@@ -188,7 +198,7 @@ def send_code_coverage_annoations(annotations, workspace, repo_slug, commit_hash
     print("Complete")
 
 
-def run(filename, minimum_passing_coverage, verbose):
+def run(filename, minimum_passing_coverage, send_all_coverage, verbose):
 
     workspace   = os.environ['BITBUCKET_WORKSPACE']
     repo_slug   = os.environ['BITBUCKET_REPO_SLUG']
@@ -207,7 +217,7 @@ def run(filename, minimum_passing_coverage, verbose):
         verbose
     )
 
-    annotations = parse_cobertura(filename)
+    annotations = parse_cobertura(filename, send_all_coverage)
 
     encFmt = getVectorCASTEncoding()
 
@@ -237,11 +247,19 @@ def run(filename, minimum_passing_coverage, verbose):
         help="Path to the Cobertura XML file to parse",
         default="cobertura.xml"
     )
+
+    parser.add_argument(
+        "-a", "--send_all_coverage",
+        help="Report all coverage.  Default is partial/fail only",
+        action="store_true",
+        default=False
+    )
+
     parser.add_argument(
-        "-m", "--minimum",
+        "--minimum_passing_coverage",
         type=float,
-        help="Minimum overall coverage required to pass (e.g., 0.8 for 80%)",
-        default=0.8
+        help="Minimum overall coverage required to pass (default 80 percent)",
+        default=80
     )
 
     parser.add_argument(
@@ -252,5 +270,5 @@ def run(filename, minimum_passing_coverage, verbose):
 
     args = parser.parse_args()
 
-    run(args.filename, args.minimum, args.verbose)
+    run(args.filename, args.minimum_passing_coverage, args.send_all_coverage, args.verbose)
 

vcast_exec.py

@@ -126,6 +126,8 @@ def __init__(self, args):
 
         self.html_base_dir = args.html_base_dir
         self.use_cte = args.use_cte
+        self.send_all_coverage = args.send_all_coverage
+        self.minimum_passing_coverage = args.minimum_passing_coverage
 
         if args.exit_with_failed_count == 'not present':
             self.useJunitFailCountPct = False
@@ -378,10 +380,9 @@ def sendToBitBucket(self):
 
             send_cobertura_to_bitbucket.run(
                 filename = fname,
-                minimum_passing_coverage = 0.8, 
-                verbose = True) #self.verbose)
-                
-
+                minimum_passing_coverage = self.minimum_passing_coverage, 
+                send_all_coverage = self.send_all_coverage,
+                verbose = self.verbose)
 
             for html_dir in [".", self.html_base_dir, "rebuild_reports"]:
                 for html in glob.glob(os.path.join(html_dir, "*.html")) \
@@ -581,15 +582,18 @@ def runExec(self):
     metricsGroup.add_argument('--cobertura', help='Generate coverage results in Cobertura xml format', action="store_true", default = False)
     metricsGroup.add_argument('--cobertura_extended', help='Generate coverage results in extended Cobertura xml format', action="store_true", default = False)
     metricsGroup.add_argument('--send_to_bitbucket', help='Generate Junit and Extended Cobertura data to send to BitBucket', action="store_true", default = False)
+    metricsGroup.add_argument('--send_all_coverage', help='Send all coverage to BitBucket. Default is partial or not coveraged', action="store_true", default = False)
+    metricsGroup.add_argument('--minimum_passing_coverage', type=float, help="Minimum overall coverage required to pass (default 80 percent)",default=80)
+
+
     metricsGroup.add_argument('--lcov', help='Generate coverage results in an LCOV format', action="store_true", default = False)
     metricsGroup.add_argument('--junit', help='Generate test results in Junit xml format', action="store_true", default = False)
     metricsGroup.add_argument('--export_rgw', help='Export RGW data', action="store_true", default = False)
     metricsGroup.add_argument('--junit_use_cte_for_classname', help=argparse.SUPPRESS, action="store_true", dest="use_cte")
     metricsGroup.add_argument('--sonarqube', help='Generate test results in SonarQube Generic test execution report format (CppUnit)', action="store_true", default = False)
     metricsGroup.add_argument('--pclp_input', help='Generate static analysis results from PC-lint Plus XML file to generic static analysis format (codequality)', action="store", default = None)
     metricsGroup.add_argument('--pclp_output_html', help='Generate static analysis results from PC-lint Plus XML file to an HTML output', action="store", default = "pclp_findings.html")
-    metricsGroup.add_argument('--exit_with_failed_count', help='Returns failed test case count as script exit.  Set a value to indicate a percentage above which the job will be marked as failed', 
-                               nargs='?', default='not present', const='(default 0)')
+    metricsGroup.add_argument('--exit_with_failed_count', help='Returns failed test case count as script exit. Set a value to indicate a percentage above which the job will be marked as failed', nargs='?', default='not present', const='(default 0)')
 
     reportGroup = parser.add_argument_group('Report Selection', 'VectorCAST Manage reports that can be generated')
     reportGroup.add_argument('--aggregate', help='Generate aggregate coverage report VectorCAST Project', action="store_true", default = False)
@@ -603,7 +607,7 @@ def runExec(self):
 
     beGroup.add_argument('--jobs', help='Number of concurrent jobs (default = 1)', default="1")
     beGroup.add_argument('--ci', help='Use Continuous Integration Licenses', action="store_true", default = False)
-    beGroup.add_argument('-l', '--level',   help='Environment Name if only doing single environment.  Should be in the form of compiler/testsuite', default=None)
+    beGroup.add_argument('-l', '--level',   help='Environment Name if only doing single environment. Should be in the form of compiler/testsuite', default=None)
     beGroup.add_argument('-e', '--environment',   help='Environment Name if only doing single environment.', default=None)
 
     parser_specify = beGroup.add_mutually_exclusive_group()
@@ -684,6 +688,6 @@ def runExec(self):
         vcExec.exportRgw()
 
     if vcExec.useJunitFailCountPct:
-        print("--exit_with_failed_count=" + args.exit_with_failed_count + " specified.  Fail Percent = " + str(round(vcExec.failed_pct,0)) + "% Return code: ", str(vcExec.failed_count))
+        print("--exit_with_failed_count=" + args.exit_with_failed_count + " specified. Fail Percent = " + str(round(vcExec.failed_pct,0)) + "% Return code: ", str(vcExec.failed_count))
         sys.exit(vcExec.failed_count)