feat(Lib/unittest): skip* now will output [SKIPPED] if possible, instead of nothing

Author: litlighilit

src/pylib/Lib/unittest/case_py.nim

@@ -91,21 +91,38 @@ gen2 assertGreaterEqual, `>=`
 gen2 assertIsInstance, `is`
 gen2 assertNotIsInstance, `is_not`
 
-template addSkip(reason) = checkpoint reason  ##\
-## XXX: TODO: not really python-like
+func fmtSkip(name, reason: string): string = name & ": " & reason
 
 template skipTest*(reason: string){.genSelf.} =
-  bind skip
-  addSkip reason
+  bind skip, fmtSkip
+  const msg = fmtSkip(astToStr(self), reason)
+  checkpoint msg
+  ## XXX: TODO: not really python-like
   skip()
 
+proc skipTest(reason, testStmt: NimNode): NimNode =
+  if testStmt.kind == nnkCommand:
+    result = newNimNode nnkCommand
+    result.add testStmt[0]
+    let name = testStmt[1]
+    result.add newCall(bindSym"fmtSkip", name, reason)
+    result.add newStmtList(
+      newCall(bindSym"skip")
+    )
+  else:
+    result = newCall(bindSym"skipTest", reason)
+
 template skip*(reason; body) =
   ## EXT.
-  addSkip reason
+  bind skipTest
+  skipTest(reason, body)
 
 template skip*(reason: string): untyped =
-  addSkip reason
-  proc (_: proc) = discard
+  bind skip, fmtSkip
+  template temp(p: proc) =
+    test fmtSkip(astToStr(p), reason):
+      skip()
+  temp
 
 proc asis_id[P: proc](x: P): P = x
 
@@ -114,20 +131,37 @@ template skipIf*(condition: bool, reason: string): proc =
   if condition: skip(reason)
   else: asis_id
 
-template doIf(cond: bool; body) =
-  if cond: body
-template doIf(cond: static bool; body) =
-  when cond: body
+macro makeSkip(cond: bool; reason: string; body; staticBanch: static[bool]) =
+  result = newNimNode(if staticBanch: nnkWhenStmt else: nnkIfStmt)
+  result.add nnkElifBranch.newTree(
+    cond, body
+  )
+  var elseBody = newStmtList()
+  if body.kind == nnkStmtList:
+    for s in body:
+      elseBody.add skipTest(reason, s)
+  elif body.kind == nnkCommand and body[0].eqIdent "test":
+    # test "xxx"
+    elseBody.add skipTest(reason, body)
+  result.add nnkElse.newTree elseBody
+
+template doOrSkip(cond: bool; reason: string; body) =
+  bind makeSkip
+  makeSkip cond, reason, body, false
+template doOrSkip(cond: static bool; reason: string; body) =
+  bind makeSkip
+  makeSkip cond, reason, body, true
 
 template skipIf*(condition: bool, reason: string; body) =
-  bind doIf
-  addSkip reason
-  doIf not condition, body
+  ## EXT.
+  bind doOrSkip
+  doOrSkip not condition, reason, body
 
 template skipUnless*(condition: bool, reason: string): proc =
   bind skipIf
   skipIf(not condition, reason)
 
 template skipUnless*(condition: bool, reason: string; body) =
+  ## EXT.
   bind skipIf
   skipIf(not condition, reason, body)

tests/testaments/builtins/round_float.nim

@@ -2,7 +2,7 @@ discard """
   action: "run"
   targets: "c js"
 
-  output: ""
+  # output: ""  this test also uses unittest.task
 """
 
 import pylib/builtins # /[round, attr]
@@ -12,7 +12,7 @@ import pylib/builtins/[pyrange, complex, format]
 import pylib/numTypes/floats
 
 import pylib/Lib/[unittest, math, random, sys]
-
+import std/unittest as std_unittest
 import ../../utils
 
 when intOver64b:
@@ -74,7 +74,7 @@ block:
 ]#
     unittest.skipUnless(getattr(sys, "float_repr_style", "") == "short",
                          "applies only when using short float repr style"):
-    # def test_previous_round_bugs(self):
+      test "previous_round_bugs":
         self.assertEqual(round(562949953421312.5, 1),
                           562949953421312.5)
 
@@ -96,7 +96,7 @@ block:
 
     unittest.skipUnless(getattr(sys, "float_repr_style", "") == "short",
                          "applies only when using short float repr style"):
-    #def test_matches_float_format(self):
+      test "matches_float_format":
         # round should give the same results as float formatting
         proc chk(x: float) =
             self.assertEqual(float(format(x, ".0f")), round(x, 0))