Skip to content

Commit

Permalink
Fix script to pass getBuildIdFromTest unit test(TriBITSPub#600)
Browse files Browse the repository at this point in the history
Moved argument parsing into a function that gets called by main and
changed getBuildIdFromTest to return the last item of the split string rather
than a constant index.
  • Loading branch information
achauphan committed Jan 25, 2024
1 parent 0930d75 commit e7f65b1
Showing 1 changed file with 16 additions and 13 deletions.
29 changes: 16 additions & 13 deletions tribits/ci_support/cdash_analyze_and_report_random_failures.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,11 @@
"""


parser = argparse.ArgumentParser("Arguments for cdash_analyze_and_report_random_failures.py")
parser.add_argument("--cdash-site-url", default="", required=True)
parser.add_argument("--cdash-project-name", default="", required=True)
parser.add_argument("--reference-date", default="yesterday")
parser.add_argument("--group-name", default="Pull%20Request")
# parser.add_argument("--cdash-nonpassed-tests-filters", default="")
parser.add_argument("--days-of-history", default=1, type=int)
parser.add_argument("--print-url-mode", choices=['none','initial','all'], default='none')

args = parser.parse_args()


# The main function
def main():

args = getCmndLineArgs()

cdashProjectTestingDayStartTime = "00:00"
cdashSiteUrl = args.cdash_site_url
cdashProjectName = args.cdash_project_name
Expand Down Expand Up @@ -172,6 +162,19 @@ def main():
print("\nNumber of failing tests from "+dateRangeStart+" to "+dateRangeEnd+": "
+str(len(nonpassingTestsLOD)))

def getCmndLineArgs():
parser = argparse.ArgumentParser("Arguments for cdash_analyze_and_report_random_failures.py")
parser.add_argument("--cdash-site-url", default="", required=True)
parser.add_argument("--cdash-project-name", default="", required=True)
parser.add_argument("--reference-date", default="yesterday")
parser.add_argument("--group-name", default="Pull%20Request")
# parser.add_argument("--cdash-nonpassed-tests-filters", default="")
parser.add_argument("--days-of-history", default=1, type=int)
parser.add_argument("--print-url-mode", choices=['none','initial','all'], default='none')

return parser.parse_args()



def getDateRangeTuple(referenceDateTime, dayTimeDelta):
beginDateTime = referenceDateTime - datetime.timedelta(days=(dayTimeDelta-1))
Expand All @@ -189,7 +192,7 @@ def getTopicTargetSha1s(buildConfigOutput):


def getBuildIdFromTest(test):
return test['buildSummaryLink'].split("/")[1]
return test['buildSummaryLink'].split("/")[-1]


def downloadBuildSummaryOffCDash(
Expand Down

0 comments on commit e7f65b1

Please sign in to comment.