From e8a3b811336a00519a3cd225067182e65786298e Mon Sep 17 00:00:00 2001
From: Ludovic Chenut <ludovic@status.im>
Date: Thu, 4 Jul 2024 14:30:46 +0200
Subject: [PATCH] fix: issue 43

---
 tests/tunittest.nim | 19 ++++++++++++++++++-
 unittest2.nim       | 23 +++++++++++++++++++----
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/tests/tunittest.nim b/tests/tunittest.nim
index 2b41665..b521b32 100644
--- a/tests/tunittest.nim
+++ b/tests/tunittest.nim
@@ -34,12 +34,14 @@ suite "PR #35":
     doAssert(true)
 
   teardown:
-    if testStatusIMPL != TestStatus.FAILED:
+    if testStatusIMPL != TestStatus.FAILED or testStatusObj.status != TestStatus.FAILED:
       testStatusIMPL = TestStatus.FAILED
+      testStatusObj.status = TestStatus.FAILED
       exitProcs.setProgramResult(QuitFailure)
       debugEcho "PR #35 test FAILED"
     else:
       testStatusIMPL = TestStatus.OK
+      testStatusObj.status = TestStatus.OK
       exitProcs.setProgramResult(QuitSuccess)
 
   test "something":
@@ -238,3 +240,18 @@ suite "break should works inside test body":
     number = 3
   test "step three":
     check number == 2
+
+suite "Issue #43":
+  proc p = fail()
+
+  teardown:
+    if testStatusObj.status != TestStatus.FAILED:
+      testStatusObj.status = TestStatus.FAILED
+      exitProcs.setProgramResult(QuitFailure)
+      debugEcho "Issue #43 test FAILED"
+    else:
+      testStatusObj.status = TestStatus.OK
+      exitProcs.setProgramResult(QuitSuccess)
+
+  test "procedure defined outside the test scope fails":
+    p()
diff --git a/unittest2.nim b/unittest2.nim
index 3e816a9..f43f27d 100644
--- a/unittest2.nim
+++ b/unittest2.nim
@@ -256,6 +256,10 @@ type
     suites: seq[JUnitSuite]
     currentSuite: int
 
+  TestStatusObject = object
+    enabled: bool
+    status: TestStatus
+
 # TODO these globals are threadvar so as to avoid gc-safety-issues - this should
 #      probably be resolved in a better way down the line specially since we
 #      don't support threads _really_
@@ -271,6 +275,7 @@ var
   testsFilters {.threadvar.}: HashSet[string]
 
   currentSuite {.threadvar.}: string
+  testStatusObj* {.threadvar.}: TestStatusObject
 
 when collect:
   var
@@ -1027,6 +1032,7 @@ template fail* =
   else:
     when declared(testStatusIMPL):
       testStatusIMPL = TestStatus.FAILED
+    testStatusObj.status = TestStatus.FAILED
 
     exitProcs.setProgramResult(1)
 
@@ -1060,7 +1066,9 @@ template skip* =
   else:
     bind checkpoints
 
-    testStatusIMPL = TestStatus.SKIPPED
+    when declared(testStatusIMPL):
+      testStatusIMPL = TestStatus.SKIPPED
+    testStatusObj.status = TestStatus.SKIPPED
     checkpoints = @[]
 
 proc runDirect(test: Test) =
@@ -1124,6 +1132,7 @@ template runtimeTest*(nameParam: string, body: untyped) =
       when NimMajor>=2:
         {.pop.}
 
+    testStatusObj.status = TestStatus.OK
     failingOnExceptions("[setup] "):
       when declared(testSetupIMPLFlag): testSetupIMPL()
       defer: failingOnExceptions("[teardown] "):
@@ -1132,8 +1141,10 @@ template runtimeTest*(nameParam: string, body: untyped) =
         body
 
     checkpoints = @[]
-
-    testStatusIMPL
+    if testStatusObj.enabled:
+      testStatusObj.status
+    else:
+      testStatusIMPL
 
   let
     localSuiteName =
@@ -1160,12 +1171,14 @@ template staticTest*(nameParam: string, body: untyped) =
       echo "[", TestStatus.OK, "     ] ", nameParam
 
 template dualTest*(nameParam: string, body: untyped) =
-  ## Similar to `test` but run the test both compuletime and run time, no
+  ## Similar to `test` but run the test both compiletime and run time, no
   ## matter the `unittest2Static` flag
+  testStatusObj.enabled = true
   staticTest nameParam:
     body
   runtimeTest nameParam:
     body
+  testStatusObj.enabled = false
 
 template test*(nameParam: string, body: untyped) =
   ## Define a single test case identified by `name`.
@@ -1181,12 +1194,14 @@ template test*(nameParam: string, body: untyped) =
   ## .. code-block::
   ##
   ##  [OK] roses are red
+  testStatusObj.enabled = true
   when nimvm:
     when unittest2Static:
       staticTest nameParam:
         body
   runtimeTest nameParam:
     body
+  testStatusObj.enabled = false
 
 {.pop.} # raises: []