From d01ed926d739a03c2eb423ace7e80eacb35a8118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
Date: Tue, 28 May 2019 23:58:13 +0200
Subject: [PATCH] add suiteTeardown() template

---
 tests/tunittestparallel.nim |  5 +++++
 unittest2.nim               | 15 +++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/tunittestparallel.nim b/tests/tunittestparallel.nim
index a39a73c..cae3fd9 100644
--- a/tests/tunittestparallel.nim
+++ b/tests/tunittestparallel.nim
@@ -116,6 +116,11 @@ suite "suite #2":
     sleep(100)
     check 1 == 1
 
+  suiteTeardown:
+    echo "suite teardown"
+
+  echo "this will be shown first"
+
 # go back to the default one
 clearOutputFormatters()
 
diff --git a/unittest2.nim b/unittest2.nim
index f0944a5..5b00f5d 100644
--- a/unittest2.nim
+++ b/unittest2.nim
@@ -106,7 +106,8 @@
 ##       expect(IndexError):
 ##         discard v[4]
 ##
-##     echo "suite teardown: run once after the tests"
+##     suiteTeardown:
+##       echo "suite teardown: run once after the tests"
 
 import locks, macros, sets, strutils, streams, times
 
@@ -133,7 +134,7 @@ when paralleliseTests:
   # (`flowVars` will be initialized in each child thread, when using nested tests, by the compiler)
   # TODO: try getting rid of them when nim-0.20.0 is released
   var flowVars {.threadvar.}: seq[FlowVarBase]
-  proc repeatableSync() =
+  proc repeatableSync*() =
     sync()
     for flowVar in flowVars:
       blockUntil(flowVar)
@@ -540,12 +541,20 @@ template suite*(name, body) {.dirty.} =
       var testTeardownIMPLFlag {.used.} = true
       template testTeardownIMPL: untyped {.dirty.} = teardownBody
 
+    template suiteTeardown(suiteTeardownBody: untyped) {.dirty, used.} =
+      var testSuiteTeardownIMPLFlag {.used.} = true
+      template testSuiteTeardownIMPL: untyped {.dirty.} = suiteTeardownBody
+
     let testSuiteName {.used.} = name
 
     ensureInitialized()
     try:
       suiteStarted(name)
       body
+      when declared(testSuiteTeardownIMPLFlag):
+        when paralleliseTests:
+          repeatableSync()
+        testSuiteTeardownIMPL()
     finally:
       suiteEnded()
 
@@ -605,8 +614,6 @@ template test*(name, body) =
         )
         testEnded(testResult)
         checkpoints = @[]
-        # when running tests in parallel, "formatters" manipulation may occur in
-        # teardown(), so it needs to be after testEnded()
         when declared(testTeardownIMPLFlag):
           testTeardownIMPL()