jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Retry commands in testament again (#16262)

Browse source
This commit is contained in:
Clyybber 2020-12-05 18:41:08 +01:00 • committed by GitHub
commit d7f244180e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
testament/categories.nim
View file

@ -482,6 +482,17 @@ proc makeSupTest(test, options: string, cat: Category): TTest =
result.options = options result.options = options
result.startTime = epochTime() result.startTime = epochTime()
const maxRetries = 3
template retryCommand(call): untyped =
var res: typeof(call)
var backoff = 1
for i in 0..<maxRetries:
res = call
if res.exitCode == QuitSuccess or i == maxRetries-1: break
sleep(backoff * 1000)
backoff *= 2
res
proc testNimblePackages(r: var TResults; cat: Category; packageFilter: string, part: PkgPart) = proc testNimblePackages(r: var TResults; cat: Category; packageFilter: string, part: PkgPart) =
if nimbleExe == "": if nimbleExe == "":
echo "[Warning] - Cannot run nimble tests: Nimble binary not found." echo "[Warning] - Cannot run nimble tests: Nimble binary not found."
@ -503,28 +514,28 @@ proc testNimblePackages(r: var TResults; cat: Category; packageFilter: string, p
let buildPath = packagesDir / name let buildPath = packagesDir / name
if not dirExists(buildPath): if not dirExists(buildPath):
let (cloneCmd, cloneOutput, cloneStatus) = execCmdEx2("git", ["clone", url, buildPath]) let (cloneCmd, cloneOutput, cloneStatus) = retryCommand execCmdEx2("git", ["clone", url, buildPath])
if cloneStatus != QuitSuccess: if cloneStatus != QuitSuccess:
r.addResult(test, targetC, "", cloneCmd & "\n" & cloneOutput, reInstallFailed) r.addResult(test, targetC, "", cloneCmd & "\n" & cloneOutput, reInstallFailed)
continue continue
if not useHead: if not useHead:
let (fetchCmd, fetchOutput, fetchStatus) = execCmdEx2("git", ["fetch", "--tags"], workingDir = buildPath) let (fetchCmd, fetchOutput, fetchStatus) = retryCommand execCmdEx2("git", ["fetch", "--tags"], workingDir = buildPath)
if fetchStatus != QuitSuccess: if fetchStatus != QuitSuccess:
r.addResult(test, targetC, "", fetchCmd & "\n" & fetchOutput, reInstallFailed) r.addResult(test, targetC, "", fetchCmd & "\n" & fetchOutput, reInstallFailed)
continue continue
let (describeCmd, describeOutput, describeStatus) = execCmdEx2("git", ["describe", "--tags", "--abbrev=0"], workingDir = buildPath) let (describeCmd, describeOutput, describeStatus) = retryCommand execCmdEx2("git", ["describe", "--tags", "--abbrev=0"], workingDir = buildPath)
if describeStatus != QuitSuccess: if describeStatus != QuitSuccess:
r.addResult(test, targetC, "", describeCmd & "\n" & describeOutput, reInstallFailed) r.addResult(test, targetC, "", describeCmd & "\n" & describeOutput, reInstallFailed)
continue continue
let (checkoutCmd, checkoutOutput, checkoutStatus) = execCmdEx2("git", ["checkout", describeOutput.strip], workingDir = buildPath) let (checkoutCmd, checkoutOutput, checkoutStatus) = retryCommand execCmdEx2("git", ["checkout", describeOutput.strip], workingDir = buildPath)
if checkoutStatus != QuitSuccess: if checkoutStatus != QuitSuccess:
r.addResult(test, targetC, "", checkoutCmd & "\n" & checkoutOutput, reInstallFailed) r.addResult(test, targetC, "", checkoutCmd & "\n" & checkoutOutput, reInstallFailed)
continue continue
let (installDepsCmd, installDepsOutput, installDepsStatus) = execCmdEx2("nimble", ["install", "--depsOnly", "-y"], workingDir = buildPath) let (installDepsCmd, installDepsOutput, installDepsStatus) = retryCommand execCmdEx2("nimble", ["install", "--depsOnly", "-y"], workingDir = buildPath)
if installDepsStatus != QuitSuccess: if installDepsStatus != QuitSuccess:
r.addResult(test, targetC, "", "installing dependencies failed:\n$ " & installDepsCmd & "\n" & installDepsOutput, reInstallFailed) r.addResult(test, targetC, "", "installing dependencies failed:\n$ " & installDepsCmd & "\n" & installDepsOutput, reInstallFailed)
continue continue