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

testament: use full test name in skips [backport] (#19937)

Browse source 
testament: use full test name in skips
This commit is contained in:
Jacek Sieka 2022-07-16 22:56:54 +02:00 • committed by GitHub
commit 094d86f997
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
testament/testament.nim
View file

@ -258,6 +258,15 @@ Tests failed and allowed to fail: $3 / $1 <br />
Tests skipped: $4 / $1 <br /> Tests skipped: $4 / $1 <br />
""" % [$x.total, $x.passed, $x.failedButAllowed, $x.skipped] """ % [$x.total, $x.passed, $x.failedButAllowed, $x.skipped]
proc testName(test: TTest, target: TTarget, extraOptions: string, allowFailure: bool): string =
var name = test.name.replace(DirSep, '/')
name.add ' ' & $target
if allowFailure:
name.add " (allowed to fail) "
if test.options.len > 0: name.add ' ' & test.options
if extraOptions.len > 0: name.add ' ' & extraOptions
name.strip()
proc addResult(r: var TResults, test: TTest, target: TTarget, proc addResult(r: var TResults, test: TTest, target: TTarget,
extraOptions, expected, given: string, successOrig: TResultEnum, extraOptions, expected, given: string, successOrig: TResultEnum,
allowFailure = false, givenSpec: ptr TSpec = nil) = allowFailure = false, givenSpec: ptr TSpec = nil) =
@ -265,13 +274,7 @@ proc addResult(r: var TResults, test: TTest, target: TTarget,
# instead of having to pass individual fields, or abusing existing ones like expected vs given. # instead of having to pass individual fields, or abusing existing ones like expected vs given.
# test.name is easier to find than test.name.extractFilename # test.name is easier to find than test.name.extractFilename
# A bit hacky but simple and works with tests/testament/tshould_not_work.nim # A bit hacky but simple and works with tests/testament/tshould_not_work.nim
var name = test.name.replace(DirSep, '/') let name = testName(test, target, extraOptions, allowFailure)
name.add ' ' & $target
if allowFailure:
name.add " (allowed to fail) "
if test.options.len > 0: name.add ' ' & test.options
if extraOptions.len > 0: name.add ' ' & extraOptions
let duration = epochTime() - test.startTime let duration = epochTime() - test.startTime
let success = if test.spec.timeout > 0.0 and duration > test.spec.timeout: reTimeout let success = if test.spec.timeout > 0.0 and duration > test.spec.timeout: reTimeout
else: successOrig else: successOrig
@ -470,6 +473,9 @@ proc equalModuloLastNewline(a, b: string): bool =
proc testSpecHelper(r: var TResults, test: var TTest, expected: TSpec, proc testSpecHelper(r: var TResults, test: var TTest, expected: TSpec,
target: TTarget, extraOptions: string, nimcache: string) = target: TTarget, extraOptions: string, nimcache: string) =
test.startTime = epochTime() test.startTime = epochTime()
if testName(test, target, extraOptions, false) in skips:
test.spec.err = reDisabled
if test.spec.err in {reDisabled, reJoined}: if test.spec.err in {reDisabled, reJoined}:
r.addResult(test, target, extraOptions, "", "", test.spec.err) r.addResult(test, target, extraOptions, "", "", test.spec.err)
inc(r.skipped) inc(r.skipped)