Merge pull request #3335 from SSPkrolik/teardown-move

Moved teardown call to try block for namespace access reasons
This commit is contained in:
Andreas Rumpf 2015-10-12 21:18:04 +02:00
commit ee93ee5e15

View file

@ -150,6 +150,8 @@ template test*(name: expr, body: stmt): stmt {.immediate, dirty.} =
try: try:
when declared(testSetupIMPLFlag): testSetupIMPL() when declared(testSetupIMPLFlag): testSetupIMPL()
body body
when declared(testTeardownIMPLFlag):
defer: testTeardownIMPL()
except: except:
when not defined(js): when not defined(js):
@ -158,7 +160,6 @@ template test*(name: expr, body: stmt): stmt {.immediate, dirty.} =
fail() fail()
finally: finally:
when declared(testTeardownIMPLFlag): testTeardownIMPL()
testDone name, testStatusIMPL testDone name, testStatusIMPL
proc checkpoint*(msg: string) = proc checkpoint*(msg: string) =