support nesting Test.@testset within ReTest.@testset (#31)

Author: rfourquet

InlineTest/src/InlineTest.jl

@@ -63,6 +63,12 @@ arguments of `@testset` can be:
 Invocations of `@testset` can be nested, but qualified invocations of
 `ReTest.@testset` can't.
 
+A `@testset` can contain a nested `Test.@testset`, or call a function
+which defines a `Test.@testset`: in this case, the `Test.@testset`
+will be run whenever the parent testset is run, but `retest` won't
+know about it: it won't be taken into account
+during the filtering phase, and won't be printed in dry mode.
+
 Internally, `@testset` expressions are converted to an equivalent of
 `Test.@testset` at execution time.
 """

src/testset.jl

@@ -84,6 +84,11 @@ function ReTestSet(mod, desc::String, id::Integer=0;
               0, false, verbose, NamedTuple(), nothing)
 end
 
+# constructor for nested Test.@testset, which is called with desc and kwargs
+ReTestSet(desc::String; verbose::Bool=false) =
+    ReTestSet(Testset, # fake, but is .mod still used?
+              desc; verbose=verbose) # doesn't seem necessary to set .parent via get_testset
+
 # For a non-passed result, simply store the result
 record(ts::ReTestSet, t::Union{Broken,Fail,Error}) = (push!(ts.results, t); t)
 # For a passed result, do not store the result since it uses a lot of memory
@@ -233,7 +238,9 @@ end
 
 # Called at the end of a @testset, behaviour depends on whether
 # this is a child of another testset, or the "root" testset
-function finish(ts::ReTestSet, chan)
+function finish(ts::ReTestSet, chan=nothing)
+    # chan == nothing: only when ts was created from Test.@testset, and is nested
+
     # If we are a nested test set, do not print a full summary
     # now - let the parent test set do the printing
     if get_testset_depth() != 0
@@ -342,9 +349,9 @@ function print_counts(ts::ReTestSet, fmt::Format, depth, align,
     # Print test set header, with an alignment that ensures all
     # the test results appear above each other
 
-    style = bold ? (bold=bold, color=:white) : NamedTuple()
     print_id(ts.id, maxidw)
-    printstyled(rpad(string("  "^depth, ts.description), align, " "); style...)
+    printstyled(rpad(string("  "^depth, ts.description), align, " ");
+                bold=bold, color = ts.mod === Testset ? :cyan : :white)
 
     np = passes + c_passes
     nf = fails + c_fails

test/runtests.jl

@@ -1515,6 +1515,31 @@ end # DryRun2
 end
 
 
+# * Test_Testset
+
+module Test_Testset
+using ReTest, ..Trace
+import Test
+
+@testset "a" begin
+    trace("a")
+    Test.@testset "b" begin
+        trace("b")
+    end
+    Test.@testset "c" begin
+        trace("c")
+        Test.@testset "d$i" for i=1:2
+            trace("d$i")
+        end
+    end
+end
+end
+
+@chapter Test_Testset begin
+    check(Test_Testset, verbose=4, ["a", "b", "c", "d1", "d2"])
+end
+
+
 # * @testset_macro ...........................................................