fix freeze with toplevel for-testsets which fail

Author: rfourquet

src/testset.jl

@@ -562,6 +562,13 @@ function testset_forloop(mod::Module, isfinal::Bool, pat::Pattern, id::Int64,
             if !first_iteration
                 pop_testset()
                 push!(arr, finish(ts, $chan))
+                if ts.exception !== nothing
+                    # ts.exception might be set in finish(...) above
+                    # In this case, we currently don't want to continue with subsequent
+                    # iterations, as is done in Test.
+                    # See also https://github.com/JuliaLang/julia/pull/41715
+                    break
+                end
                 # it's 1000 times faster to copy from tmprng rather than calling Random.seed!
                 copy!(RNG, tmprng)
             end
@@ -604,7 +611,7 @@ function testset_forloop(mod::Module, isfinal::Bool, pat::Pattern, id::Int64,
             end
         finally
             # Handle `return` in test body
-            if !first_iteration
+            if !first_iteration && ts.exception === nothing
                 pop_testset()
                 push!(arr, finish(ts, $chan))
             end

test/runtests.jl

@@ -1264,6 +1264,48 @@ end # Failing
 """)
 end
 
+module FailingLoops
+# we test that toplevel testset-for don't make retest unresponsive
+
+using ReTest
+
+@testset "a$i" for i=1:3
+    @test i == 1
+end
+
+@testset "b$i" for i=1:3
+    @test i == 2
+end
+
+@testset "c$i" for i=1:3
+    @test i == 3
+end
+
+end # FailingLoops
+
+@chapter FailingLoops begin
+    @test_throws Test.TestSetException retest(FailingLoops, "a")
+    # TODO: we check here the behaviour by looking at check marks, we could maybe do better
+    check(FailingLoops, "a", dry=true, marks=true, id=false, [], clear=true, output="""
+a1 ✔
+a2 ✘
+a3
+""")
+    @test_throws Test.TestSetException retest(FailingLoops, "b")
+    check(FailingLoops, "b", dry=true, marks=true, id=false, [], clear=true, output="""
+b1 ✘
+b2
+b3
+""")
+    @test_throws Test.TestSetException retest(FailingLoops, "c")
+    check(FailingLoops, "c", dry=true, marks=true, id=false, [], clear=true, output="""
+c1 ✘
+c2
+c3
+""")
+end
+
+
 # * Duplicate ................................................................
 
 module Duplicate