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

JS unittest stacktrace fix, cleanup js repr and inclrtl includes (#14168)

Browse source
This commit is contained in:
hlaaftana 2020-04-30 19:04:53 +03:00 • committed by GitHub
commit 0aefebb728
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pure/unittest.nim
View file

@ -101,7 +101,9 @@ include "system/inclrtl"
when declared(stdout):
import os
when not defined(ECMAScript):
const useTerminal = not defined(js)
when useTerminal:
import terminal
type
@ -224,7 +226,7 @@ proc defaultConsoleFormatter*(): <//>ConsoleOutputFormatter =
method suiteStarted*(formatter: ConsoleOutputFormatter, suiteName: string) =
template rawPrint() = echo("\n[Suite] ", suiteName)
when not defined(ECMAScript):
when useTerminal:
if formatter.colorOutput:
styledEcho styleBright, fgBlue, "\n[Suite] ", resetStyle, suiteName
else: rawPrint()
@ -250,7 +252,7 @@ method testEnded*(formatter: ConsoleOutputFormatter, testResult: TestResult) =
let prefix = if testResult.suiteName.len > 0: " " else: ""
template rawPrint() = echo(prefix, "[", $testResult.status, "] ",
testResult.testName)
when not defined(ECMAScript):
when useTerminal:
if formatter.colorOutput:
var color = case testResult.status
of TestStatus.OK: fgGreen
@ -515,11 +517,10 @@ template test*(name, body) {.dirty.} =
body
except:
when not defined(js):
let e = getCurrentException()
let eTypeDesc = "[" & exceptionTypeName(e) & "]"
checkpoint("Unhandled exception: " & getCurrentExceptionMsg() & " " & eTypeDesc)
var stackTrace {.inject.} = e.getStackTrace()
let e = getCurrentException()
let eTypeDesc = "[" & exceptionTypeName(e) & "]"
checkpoint("Unhandled exception: " & getCurrentExceptionMsg() & " " & eTypeDesc)
var stackTrace {.inject.} = e.getStackTrace()
fail()
finally: