diff options
| author | Dean Thompson <deansherthompson@gmail.com> | 2019-01-21 16:40:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 16:40:04 -0500 |
| commit | a6de0274ee768d135bab280d2b2700a0bb475300 (patch) | |
| tree | 176b91e837ab7d2217713665c16fc28163017960 /testament/htmlgen.nim | |
| parent | 5b39c7aca91c1d20eb81425cf8f3854876aed475 (diff) | |
| parent | ee89ba6bdb664fe4972f2917499cff1afdac0bab (diff) | |
| download | Nim-a6de0274ee768d135bab280d2b2700a0bb475300.tar.gz | |
Merge pull request #1 from nim-lang/devel
Getting the latest from nim-lang
Diffstat (limited to 'testament/htmlgen.nim')
| -rw-r--r-- | testament/htmlgen.nim | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/testament/htmlgen.nim b/testament/htmlgen.nim index 4a10fe00c..641c1c32c 100644 --- a/testament/htmlgen.nim +++ b/testament/htmlgen.nim @@ -11,7 +11,7 @@ import cgi, backend, strutils, json, os, tables, times -import "testamenthtml.templ" +import "testamenthtml.nimf" proc generateTestResultPanelPartial(outfile: File, testResultRow: JsonNode) = let @@ -35,12 +35,12 @@ proc generateTestResultPanelPartial(outfile: File, testResultRow: JsonNode) = bgCtxClass = "success" resultSign = "ok" resultDescription = "PASS" - of "reIgnored": + of "reDisabled", "reJoined": panelCtxClass = "info" textCtxClass = "info" bgCtxClass = "info" resultSign = "question" - resultDescription = "SKIP" + resultDescription = if result != "reJoined": "SKIP" else: "JOINED" else: panelCtxClass = "danger" textCtxClass = "danger" @@ -78,7 +78,8 @@ proc allTestResults(onlyFailing = false): AllTests = let state = elem["result"].str inc result.totalCount if state.contains("reSuccess"): inc result.successCount - elif state.contains("reIgnored"): inc result.ignoredCount + elif state.contains("reDisabled") or state.contains("reJoined"): + inc result.ignoredCount if not onlyFailing or not(state.contains("reSuccess")): result.data.add elem result.successPercentage = 100 * |