[WIP] Help wanted: switch Base.Test to use testsets everywhere

base/test.jl

@@ -421,32 +421,34 @@ record(ts::DefaultTestSet, t::Union{Pass,Broken}) = (push!(ts.results, t); t)
 # For the other result types, immediately print the error message
 # but do not terminate. Print a backtrace.
 function record(ts::DefaultTestSet, t::Union{Fail, Error})
-    print_with_color(:white, ts.description, ": ")
-    print(t)
-    # don't print the backtrace for Errors because it gets printed in the show
-    # method
-    isa(t, Error) || Base.show_backtrace(STDOUT, backtrace())
-    println()
+    if myid() == 1
+        print_with_color(:white, ts.description, ": ")
+        print(t)
+        # don't print the backtrace for Errors because it gets printed in the show
+        # method
+        isa(t, Error) || Base.show_backtrace(STDERR, backtrace())
+        println()
+    end
     push!(ts.results, t)
-    t
+    t, isa(t, Error) || backtrace()
 end
 
 # When a DefaultTestSet finishes, it records itself to its parent
 # testset, if there is one. This allows for recursive printing of
 # the results at the end of the tests
 record(ts::DefaultTestSet, t::AbstractTestSet) = push!(ts.results, t)
 
-# 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::DefaultTestSet)
-    # 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
-        # Attach this test set to the parent test set
-        parent_ts = get_testset()
-        record(parent_ts, ts)
-        return
+function print_test_errors(ts::DefaultTestSet)
+    for t in ts.results
+        if (isa(t, Error) || isa(t, Fail)) && myid() == 1
+            Base.show(STDERR,t)
+        elseif isa(t, DefaultTestSet)
+            print_test_errors(t)
+        end
     end
+end
+
+function print_test_results(ts::DefaultTestSet, depth_pad=0)
     # Calculate the overall number for each type so each of
     # the test result types are aligned
     passes, fails, errors, broken, c_passes, c_fails, c_errors, c_broken = get_test_counts(ts)
@@ -489,11 +491,25 @@ function finish(ts::DefaultTestSet)
     end
     println()
     # Recursively print a summary at every level
-    print_counts(ts, 0, align, pass_width, fail_width, error_width, broken_width, total_width)
+    print_counts(ts, depth_pad, align, pass_width, fail_width, error_width, broken_width, total_width)
+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::DefaultTestSet)
+    # 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
+        # Attach this test set to the parent test set
+        parent_ts = get_testset()
+        record(parent_ts, ts)
+        return
+    end
     # Finally throw an error as we are the outermost test set
-    if total != total_pass
+    #print_test_results(ts)
+    #=if total != total_pass
         throw(TestSetException(total_pass,total_fail,total_error, total_broken))
-    end
+    end=#
 
     # return the testset so it is returned from the @testset macro
     ts
@@ -547,7 +563,6 @@ function print_counts(ts::DefaultTestSet, depth, align,
     # through any child test sets
     passes, fails, errors, broken, c_passes, c_fails, c_errors, c_broken = get_test_counts(ts)
     subtotal = passes + fails + errors + broken + c_passes + c_fails + c_errors + c_broken
-
     # Print test set header, with an alignment that ensures all
     # the test results appear above each other
     print(rpad(string(lpad("  ",depth), ts.description), align, " "), " | ")

test/arrayops.jl

@@ -1788,8 +1788,6 @@ for op in (:.+, :.*, :.÷, :.%, :.<<, :.>>, :.-, :./, :.\, :.//, :.^)
     @eval @test typeof($(op)(A,A)) == Matrix{Foo}
 end
 
-end
-
 # Test that concatenations of dense matrices/vectors yield dense matrices/vectors
 let
     N = 4

test/base64.jl

@@ -1,5 +1,5 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
-
+@testset "base64" begin
 const inputText = "Man is distinguished, not only by his reason, but by this singular passion from other animals, which is a lust of the mind, that by a perseverance of delight in the continued and indefatigable generation of knowledge, exceeds the short vehemence of any carnal pleasure."
 const encodedMaxLine76 =
 """TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlz
@@ -41,3 +41,5 @@ ipipe = Base64DecodePipe(IOBuffer(string(encodedMaxLine76[1:end-2],"==")))
 # Test incorrect format
 ipipe = Base64DecodePipe(IOBuffer(encodedMaxLine76[1:end-3]))
 @test_throws ArgumentError readstring(ipipe)
+
+end

test/bigint.jl

@@ -316,7 +316,6 @@ end
 @test big(5)^true == big(5)
 @test big(5)^false == one(BigInt)
 
-
 # operations that when applied to Int64 give Float64, should give BigFloat
 @test typeof(exp(a)) == BigFloat
 @test typeof(exp2(a)) == BigFloat

test/bitarray.jl

@@ -1,7 +1,5 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
-using Base.Test
-
 tc{N}(r1::NTuple{N}, r2::NTuple{N}) = all(x->tc(x...), [zip(r1,r2)...])
 tc{N}(r1::BitArray{N}, r2::Union{BitArray{N},Array{Bool,N}}) = true
 tc{T}(r1::T, r2::T) = true

test/blas.jl

@@ -299,3 +299,4 @@ for elty in [Float32, Float64, Complex64, Complex128]
         @test_throws DimensionMismatch BLAS.syrk!('L','N',one(elty),eye(elty,5),one(elty),eye(elty,6))
     end
 end
+

test/broadcast.jl

@@ -1,7 +1,6 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
 module TestBroadcastInternals
-
 using Base.Broadcast: broadcast_indices, check_broadcast_indices,
                       check_broadcast_shape, newindex, _bcs, _bcsm
 using Base: Test, OneTo

test/char.jl

@@ -1,7 +1,5 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
-#tests for /base/char.jl
-
 @test typemin(Char) == Char(0)
 @test ndims(Char) == 0
 @test getindex('a', 1) == 'a'

test/checked.jl

@@ -1,7 +1,5 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
-# Checked integer arithmetic
-
 import Base: checked_abs, checked_neg, checked_add, checked_sub, checked_mul,
              checked_div, checked_rem, checked_fld, checked_mod, checked_cld
 

test/choosetests.jl

@@ -83,7 +83,10 @@ function choosetests(choices = [])
     net_required_for = ["socket", "parallel", "libgit2"]
     net_on = true
     try
-        getipaddr()
+        ipa = getipaddr()
+        if ipa == ip"127.0.0.1"
+            net_on = false
+        end
     catch
         warn("Networking unavailable: Skipping tests [" * join(net_required_for, ", ") * "]")
         net_on = false

test/cmdlineargs.jl

@@ -1,5 +1,7 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
+@testset "cmdlineargs" begin
+
 catcmd = `cat`
 if is_windows()
     try # use busybox-w32 on windows
@@ -339,3 +341,5 @@ for precomp in ("yes", "no")
     @test length(lno.captures) == 1
     @test parse(Int, lno.captures[1]) > 0
 end
+
+end

test/core.jl

@@ -1108,7 +1108,7 @@ let
     @test a==1 && b==2
 end
 
-# issue #1876
+@testset "issue #1876" begin
 let
     tst = 1
     m1(i) = (tst+=1;i-1)
@@ -1126,6 +1126,7 @@ let
     X[r...] *= 2
     @test X == [1,4,6,4]
 end
+end
 
 # issue #1632
 let
@@ -2301,24 +2302,26 @@ g9535() = (f9535(),f9535())
 
 # weak references
 type Obj; x; end
-@noinline function mk_wr(r, wr)
-    x = Obj(1)
-    push!(r, x)
-    push!(wr, WeakRef(x))
-end
-test_wr(r,wr) = @test r[1] == wr[1].value
-function test_wr()
-    ref = []
-    wref = []
-    mk_wr(ref, wref)
-    test_wr(ref, wref)
-    gc()
-    test_wr(ref, wref)
-    pop!(ref)
-    gc()
-    @test wref[1].value === nothing
+@testset "weak references" begin
+    @noinline function mk_wr(r, wr)
+        x = Obj(1)
+        push!(r, x)
+        push!(wr, WeakRef(x))
+    end
+    test_wr(r,wr) = @test r[1] == wr[1].value
+    function test_wr()
+        ref = []
+        wref = []
+        mk_wr(ref, wref)
+        test_wr(ref, wref)
+        gc()
+        test_wr(ref, wref)
+        pop!(ref)
+        gc()
+        @test_broken wref[1].value == nothing
+    end
+    test_wr()
 end
-test_wr()
 
 # issue #9947
 function f9947()

test/dates.jl

@@ -4,7 +4,7 @@ module TestDates
 
 using Base.Dates
 using Base.Test
-
+@testset "dates" begin
 include("dates/types.jl")
 include("dates/periods.jl")
 include("dates/accessors.jl")
@@ -15,5 +15,5 @@ include("dates/ranges.jl")
 include("dates/adjusters.jl")
 include("dates/rounding.jl")
 include("dates/io.jl")
-
+end
 end

test/dates/adjusters.jl

@@ -458,3 +458,4 @@ end) == 251
     end
     return sum == 15
 end) == 15 # On average, there's one of those months every year
+

test/dates/arithmetic.jl

@@ -388,3 +388,4 @@ t4 = [DateTime(2009,1,1,0,0,1), DateTime(2009,1,2,0,1), DateTime(2009,1,3,1)]
 @test t4 - t3 == [Millisecond(1000), Millisecond(60000), Millisecond(3600000)]
 @test (Date(2009,1,1):Week(1):Date(2009,1,21)) - (Date(2009,1,1):Day(1):Date(2009,1,3)) == [0d, 6d, 12d]
 @test (DateTime(2009,1,1,1,1,1):Second(1):DateTime(2009,1,1,1,1,3)) - (DateTime(2009,1,1,1,1):Second(1):DateTime(2009,1,1,1,1,2)) == [1s, 1s, 1s]
+

test/dates/conversions.jl

@@ -103,3 +103,4 @@ b = Dates.Date(2000)
 @test convert(Date,730120) == b
 @test convert(Date,730120.0) == b
 @test convert(Date,Int32(730120)) == b
+

test/dates/periods.jl

@@ -380,3 +380,4 @@ cpa = [1y+1s 1m+1s 1w+1s 1d+1s; 1h+1s 1mi+1s 2m+1s 1s+1ms]
 
 @test [1y+1s 1m+1s; 1w+1s 1d+1s] + [1y+1h 1y+1mi; 1y+1s 1y+1ms] == [2y+1h+1s 1y+1m+1mi+1s; 1y+1w+2s 1y+1d+1s+1ms]
 @test [1y+1s 1m+1s; 1w+1s 1d+1s] - [1y+1h 1y+1mi; 1y+1s 1y+1ms] == [1s-1h 1m+1s-1y-1mi; 1w-1y 1d+1s-1y-1ms]
+

test/dates/query.jl

@@ -197,3 +197,4 @@ end
 @test Dates.dayofquarter(Dates.DateTime(2014,6,30)) == 91
 @test Dates.dayofquarter(Dates.DateTime(2014,9,30)) == 92
 @test Dates.dayofquarter(Dates.DateTime(2014,12,31)) == 92
+

test/dates/ranges.jl

@@ -419,6 +419,8 @@ testlengths(100000)
 # Custom definition to override default step of DateTime ranges
 @test typeof(step(Dates.DateTime(2000):Dates.DateTime(2001))) == Dates.Day
 
+a = Dates.Date(2013,1,1)
+b = Dates.Date(2013,2,1)
 d = Dates.Date(2020,1,1)
 @test length(a:Dates.Year(1):d) == 8
 @test first(a:Dates.Year(1):d) == a
@@ -433,6 +435,8 @@ d = Dates.Date(2020,1,1)
 @test first(a:Dates.Day(365):d) == a
 @test last(a:Dates.Day(365):d) == Dates.Date(2019,12,31)
 
+a = Dates.Date(2013,1,1)
+b = Dates.Date(2013,2,1)
 @test length(a:Dates.Year(1):Dates.Date(2020,2,1)) == 8
 @test length(a:Dates.Year(1):Dates.Date(2020,6,1)) == 8
 @test length(a:Dates.Year(1):Dates.Date(2020,11,1)) == 8

test/dates/types.jl

@@ -171,3 +171,4 @@ ms = Dates.Millisecond(1)
 
 @test isfinite(Dates.Date)
 @test isfinite(Dates.DateTime)
+

test/enums.jl

@@ -1,9 +1,7 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
 module TestEnums
-
 using Base.Test
-
 @test_throws MethodError convert(Enum, 1.0)
 
 @test_throws ArgumentError eval(:(@enum Foo))
@@ -168,4 +166,4 @@ let b = IOBuffer()
     @test deserialize(b) === apple
 end
 
-end # module
+end

test/examples.jl

@@ -86,4 +86,3 @@ if !zmq_found
 end
 
 include(joinpath(dir, "clustermanager/0mq/ZMQCM.jl"))
-

test/fastmath.jl

@@ -1,7 +1,5 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
-# fast math
-
 # check expansions
 
 @test macroexpand(:(@fastmath 1+2)) == :(Base.FastMath.add_fast(1,2))

test/fft.jl

@@ -1,6 +1,5 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
-# fft
 a = rand(8) + im*rand(8)
 @test norm(ifft(fft(a)) - a) < 1e-8
 @test norm(ifft(fft(a,1),1) - a) < 1e-8

test/float16.jl

@@ -1,7 +1,5 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
-using Base.Test
-
 f = Float16(2.)
 g = Float16(1.)
 
@@ -146,3 +144,4 @@ end
 
 # issue #17148
 @test rem(Float16(1.2), Float16(one(1.2))) == 0.20019531f0
+

test/floatapprox.jl

@@ -59,3 +59,4 @@
 @test [0,1] ≈ [1e-9, 1]
 @test [0,Inf] ≈ [0,Inf]
 @test [0,Inf] ≉ [0,-Inf]
+

test/floatfuncs.jl

@@ -1,9 +1,6 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
-using Base.Test
-
-# test the basic floating point functions
-
+@testset "floatfuncs" begin
 # flipsign
 
 for elty in (Float32,Float64)
@@ -68,3 +65,4 @@ for elty in (Float32,Float64)
         @test round(elty2,A) == fill(round(elty2,x),(10,10,10))
     end
 end
+end

test/goto.jl

@@ -1,7 +1,5 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
-# Basic goto tests
-
 function goto_test1()
     @goto a
     return false
@@ -125,3 +123,4 @@ function f15561()
     @label crater
 end
 @test f15561() === nothing
+

test/grisu.jl

@@ -1751,3 +1751,4 @@ len,point,neg = Grisu.grisu(1.0, Grisu.FIXED, 0, buffer)
 @test 1 >= len-1
 @test "1" == unsafe_string(pointer(buffer))
 @test !neg
+