From 1968011a55eaa65d44dd8ea35e158006e0cc3445 Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 3 Mar 2022 22:56:23 -0500 Subject: [PATCH 01/22] suppress time prints --- test/misc.jl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/misc.jl b/test/misc.jl index 9a92d0fda0076..9faf6cbc91cc1 100644 --- a/test/misc.jl +++ b/test/misc.jl @@ -283,6 +283,7 @@ v11801, t11801 = @timed sin(1) @test names(@__MODULE__, all = true) == names_before_timing +redirect_stdout(devnull) do # suppress time prints # Accepted @time argument formats @test @time true @test @time "message" true @@ -348,6 +349,9 @@ end after = Base.cumulative_compile_time_ns_after(); @test after >= before; +wait(t1) +wait(t2) +end # redirect_stdout # interactive utilities From 323605112f13b47f6d8092becf3671cb9e98b3b4 Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 3 Mar 2022 22:58:53 -0500 Subject: [PATCH 02/22] avoid replacing module Foo warning --- test/loading.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/loading.jl b/test/loading.jl index 5ee20bfb07fca..d98d31501656c 100644 --- a/test/loading.jl +++ b/test/loading.jl @@ -737,9 +737,9 @@ Base.set_active_project(saved_active_project) @test watcher_counter[] == 3 # issue #28190 -module Foo; import Libdl; end -import .Foo.Libdl; import Libdl -@test Foo.Libdl === Libdl +module Foo28190; import Libdl; end +import .Foo28190.Libdl; import Libdl +@test Foo28190.Libdl === Libdl @testset "include with mapexpr" begin let exprs = Any[] From 761fc2ac50dadb5da559f70e74df54e207972aef Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 3 Mar 2022 23:02:46 -0500 Subject: [PATCH 03/22] suppress empty info log --- test/backtrace.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/backtrace.jl b/test/backtrace.jl index 3aebfec410f34..b9bf1939d5b99 100644 --- a/test/backtrace.jl +++ b/test/backtrace.jl @@ -183,6 +183,7 @@ let bt, found = false end # issue 28618 +Base.CoreLogging.with_logger(Base.CoreLogging.NullLogger()) do let bt, found = false @info "" bt = backtrace() @@ -193,6 +194,7 @@ let bt, found = false end @test found end +end # with_logger # Syntax error locations appear in backtraces let trace = try From 3f9d426b8ab460fe586ca44feb8e43eed656fdb0 Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 3 Mar 2022 23:11:28 -0500 Subject: [PATCH 04/22] Artifacts: make test artifact downloads quiet --- stdlib/Artifacts/test/refresh_artifacts.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/Artifacts/test/refresh_artifacts.jl b/stdlib/Artifacts/test/refresh_artifacts.jl index a70e13db1ee93..7078912c00072 100644 --- a/stdlib/Artifacts/test/refresh_artifacts.jl +++ b/stdlib/Artifacts/test/refresh_artifacts.jl @@ -12,11 +12,11 @@ let if meta isa Array for meta in meta get(meta, "lazy", false) && continue - ensure_artifact_installed(name, meta, toml; platform=unused) + ensure_artifact_installed(name, meta, toml; platform=unused, io = devnull) end else; meta::Dict get(meta, "lazy", false) && continue - ensure_artifact_installed(name, meta, toml; platform=unused) + ensure_artifact_installed(name, meta, toml; platform=unused, io = devnull) end end end From 1040a17dba8806f068e41c33a19b9b616648b865 Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 3 Mar 2022 23:16:22 -0500 Subject: [PATCH 05/22] LazyArtifacts: make test install quiet --- stdlib/LazyArtifacts/test/runtests.jl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/stdlib/LazyArtifacts/test/runtests.jl b/stdlib/LazyArtifacts/test/runtests.jl index 5e3850caecf4c..53898082cd346 100644 --- a/stdlib/LazyArtifacts/test/runtests.jl +++ b/stdlib/LazyArtifacts/test/runtests.jl @@ -5,8 +5,10 @@ using Test mktempdir() do tempdir LazyArtifacts.Artifacts.with_artifacts_directory(tempdir) do - socrates_dir = artifact"socrates" - @test isdir(socrates_dir) + redirect_stderr(devnull) do + socrates_dir = artifact"socrates" + @test isdir(socrates_dir) + end ex = @test_throws ErrorException artifact"HelloWorldC" @test startswith(ex.value.msg, "Artifact \"HelloWorldC\" was not installed correctly. ") end @@ -18,10 +20,12 @@ end using Test mktempdir() do tempdir Artifacts.with_artifacts_directory(tempdir) do - socrates_dir = @test_logs( - (:warn, "using Pkg instead of using LazyArtifacts is deprecated"), - artifact"socrates") - @test isdir(socrates_dir) + redirect_stderr(devnull) do + socrates_dir = @test_logs( + (:warn, "using Pkg instead of using LazyArtifacts is deprecated"), + artifact"socrates") + @test isdir(socrates_dir) + end end end'`, dir=@__DIR__))) From f5ad556e404e9555a89883e3f36e3f616c044b77 Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 3 Mar 2022 23:18:56 -0500 Subject: [PATCH 06/22] REPL: suppress foo echo tests --- stdlib/REPL/test/repl.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stdlib/REPL/test/repl.jl b/stdlib/REPL/test/repl.jl index d711d0be5e243..05f583c807165 100644 --- a/stdlib/REPL/test/repl.jl +++ b/stdlib/REPL/test/repl.jl @@ -751,6 +751,7 @@ fake_repl() do stdin_write, stdout_read, repl @test readuntil(stdout_read, "end", keep=true) == "\n\r\e[7C α=1\n\r\e[7C β=2\n\r\e[7Cend" # Test switching repl modes + redirect_stdout(devnull) do # to suppress "foo" echoes sendrepl2("""\e[200~ julia> A = 1 1 @@ -775,6 +776,7 @@ fake_repl() do stdin_write, stdout_read, repl wait(c) @test Main.A == 1 @test Main.B == 2 + end # redirect_stdout # Close repl write(stdin_write, '\x04') From 22784d5da1c2365b95520026b01c247513e204a0 Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 4 Mar 2022 11:17:58 -0500 Subject: [PATCH 07/22] make GC.enable_logging test capture and test print --- test/misc.jl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/misc.jl b/test/misc.jl index 9faf6cbc91cc1..3e010f4282a4e 100644 --- a/test/misc.jl +++ b/test/misc.jl @@ -1069,9 +1069,16 @@ end GC.safepoint() - GC.enable_logging(true) - GC.gc() - GC.enable_logging(false) + mktemp() do tmppath, _ + open(tmppath, "w") do tmpio + redirect_stderr(tmpio) do + GC.enable_logging(true) + GC.gc() + GC.enable_logging(false) + end + end + @test occursin("GC: pause", read(open(tmppath), String)) + end end @testset "fieldtypes Module" begin From 3dc721703fb0c81b37715a1097e4145614a1b480 Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 4 Mar 2022 11:40:47 -0500 Subject: [PATCH 08/22] capture tested deprecation warnings --- test/deprecation_exec.jl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/deprecation_exec.jl b/test/deprecation_exec.jl index de5acf977ba82..a0332740af01f 100644 --- a/test/deprecation_exec.jl +++ b/test/deprecation_exec.jl @@ -136,7 +136,8 @@ end @testset "tuple indexed by float deprecation" begin @test_deprecated getindex((1,), 1.0) === 1 @test_deprecated getindex((1,2), 2.0) === 2 - @test_throws Exception getindex((), 1.0) - @test_throws Exception getindex((1,2), 0.0) - @test_throws Exception getindex((1,2), -1.0) + @test Base.JLOptions().depwarn == 1 + @test_throws Exception @test_warn r"`getindex(t::Tuple, i::Real)` is deprecated" getindex((), 1.0) + @test_throws Exception @test_warn r"`getindex(t::Tuple, i::Real)` is deprecated" getindex((1,2), 0.0) + @test_throws Exception @test_warn r"`getindex(t::Tuple, i::Real)` is deprecated" getindex((1,2), -1.0) end From a437d7f33e9ddbdb3c543493c00246566614fbca Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 4 Mar 2022 11:56:54 -0500 Subject: [PATCH 09/22] switch with_logger to test_logs --- test/backtrace.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/backtrace.jl b/test/backtrace.jl index b9bf1939d5b99..fae928a792f4d 100644 --- a/test/backtrace.jl +++ b/test/backtrace.jl @@ -183,7 +183,7 @@ let bt, found = false end # issue 28618 -Base.CoreLogging.with_logger(Base.CoreLogging.NullLogger()) do +@test_logs (:info, "") begin let bt, found = false @info "" bt = backtrace() @@ -194,7 +194,7 @@ let bt, found = false end @test found end -end # with_logger +end # @test_logs # Syntax error locations appear in backtraces let trace = try From 4d1090aa46608a71c3788d62ad517e985cd430bc Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 4 Mar 2022 17:28:10 -0500 Subject: [PATCH 10/22] tidy up Base.active_project_callbacks earlier to avoid error log --- test/loading.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/loading.jl b/test/loading.jl index d98d31501656c..930894bebc8ab 100644 --- a/test/loading.jl +++ b/test/loading.jl @@ -234,6 +234,7 @@ append!(empty!(DEPOT_PATH), [mktempdir(), joinpath(@__DIR__, "depot")]) @test watcher_counter[] == 0 @test_logs (:error, r"active project callback .* failed") Base.set_active_project(nothing) @test watcher_counter[] == 1 +pop!(Base.active_project_callbacks) @test load_path() == [joinpath(@__DIR__, "project", "Project.toml")] @@ -732,7 +733,7 @@ end append!(empty!(LOAD_PATH), saved_load_path) append!(empty!(DEPOT_PATH), saved_depot_path) -for _ = 1:2 pop!(Base.active_project_callbacks) end +pop!(Base.active_project_callbacks) Base.set_active_project(saved_active_project) @test watcher_counter[] == 3 From 75c98a21e273b553a62c24215c1d54495171333d Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 4 Mar 2022 22:00:57 -0500 Subject: [PATCH 11/22] FileWatching: suppress Pidfile warning logs --- stdlib/FileWatching/test/pidfile.jl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stdlib/FileWatching/test/pidfile.jl b/stdlib/FileWatching/test/pidfile.jl index 757b0b20bdfb7..60f067db47353 100644 --- a/stdlib/FileWatching/test/pidfile.jl +++ b/stdlib/FileWatching/test/pidfile.jl @@ -20,6 +20,10 @@ Base.Filesystem.mtime(io::MemoryFile) = io.mtime # open mask without interference from parent's state # and create a test environment temp directory umask(new_mask) = ccall((@static iswindows() ? :_umask : :umask), Cint, (Cint,), new_mask) + +# TODO: Use targetted @test_log tests instead of suppressing all logs to hide the expected warnings +Base.CoreLogging.with_logger(Base.CoreLogging.NullLogger()) do + @testset "Pidfile.jl" begin old_umask = umask(0o002) try @@ -356,3 +360,5 @@ end; end # cd(tempdir) finally umask(old_umask) end; end # testset + +end # with_logger From 6f03d26b6d9bf9f3730cc9ec3410c170e05b758f Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 4 Mar 2022 22:01:44 -0500 Subject: [PATCH 12/22] instead of suppressing empty info log, use a debug --- test/backtrace.jl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/backtrace.jl b/test/backtrace.jl index fae928a792f4d..35b607137a5c2 100644 --- a/test/backtrace.jl +++ b/test/backtrace.jl @@ -183,9 +183,8 @@ let bt, found = false end # issue 28618 -@test_logs (:info, "") begin let bt, found = false - @info "" + @debug "" bt = backtrace() for frame in map(lookup, bt) if frame[1].line == @__LINE__() - 2 && frame[1].file == Symbol(@__FILE__) @@ -194,7 +193,6 @@ let bt, found = false end @test found end -end # @test_logs # Syntax error locations appear in backtraces let trace = try From 2f212220b000ad1876b4262b9c68773857738245 Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 4 Mar 2022 22:13:33 -0500 Subject: [PATCH 13/22] convert a noisy boundscheck testset to regular tests --- test/boundscheck_exec.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/boundscheck_exec.jl b/test/boundscheck_exec.jl index 71690c55faeca..6d42adf37cb28 100644 --- a/test/boundscheck_exec.jl +++ b/test/boundscheck_exec.jl @@ -259,7 +259,7 @@ if bc_opt == bc_default || bc_opt == bc_off @test !occursin("arrayref(true", typed_40281) end -@testset "pass inbounds meta to getindex on CartesianIndices (#42115)" begin +begin # Pass inbounds meta to getindex on CartesianIndices (#42115) @inline getindex_42115(r, i) = @inbounds getindex(r, i) @inline getindex_42115(r, i, j) = @inbounds getindex(r, i, j) From d45b13f66a8da61ff65e5b0f57f6915a8505f832 Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 5 Mar 2022 00:09:32 -0500 Subject: [PATCH 14/22] add missing SecretBuffer shred!s --- test/secretbuffer.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/secretbuffer.jl b/test/secretbuffer.jl index aea2a662766c9..d0a05fdfd0cfa 100644 --- a/test/secretbuffer.jl +++ b/test/secretbuffer.jl @@ -99,6 +99,7 @@ using Test @test position(sb) == 0 skip(sb, sb.size) @test position(sb) == sb.size + shred!(sb) end @testset "seekend" begin sb = SecretBuffer("hello") @@ -120,5 +121,6 @@ using Test sb1 = SecretBuffer("hello") sb2 = SecretBuffer("juliaisawesome") @test hash(sb1, UInt(5)) === hash(sb2, UInt(5)) + shred!(sb1); shred!(sb2) end end From 33184ce0f6b9d4bbae90deb6b31e0638a76a226c Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 5 Mar 2022 00:44:20 -0500 Subject: [PATCH 15/22] remove debug-looking print --- test/secretbuffer.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/test/secretbuffer.jl b/test/secretbuffer.jl index d0a05fdfd0cfa..df67204dd63ba 100644 --- a/test/secretbuffer.jl +++ b/test/secretbuffer.jl @@ -109,7 +109,6 @@ using Test end @testset "position" begin sb = SecretBuffer("Julia") - println("testing position") initial_pos = (position(sb)) seek(sb,2) mid_pos = position(sb) From 51c1346d8d2a2398fe094563a1274cc70db02108 Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 5 Mar 2022 00:51:42 -0500 Subject: [PATCH 16/22] don't use testsets in tests that are run in parallel --- test/deprecation_exec.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/deprecation_exec.jl b/test/deprecation_exec.jl index a0332740af01f..54c848f69b820 100644 --- a/test/deprecation_exec.jl +++ b/test/deprecation_exec.jl @@ -46,7 +46,7 @@ end # Create a consistent call frame for nowarn tests @noinline call(f, args...) = @noinline f(args...) -@testset "@deprecate" begin +begin # @deprecate using .DeprecationTests using .Foo1234 @test foo1234(3) == 4 @@ -99,7 +99,7 @@ f24658() = depwarn24658() depwarn24658() = Base.firstcaller(backtrace(), :_func_not_found_) -@testset "firstcaller" begin +begin # firstcaller # issue #24658 @test eval(:(if true; f24658(); end)) == (Ptr{Cvoid}(0),StackTraces.UNKNOWN) end @@ -125,7 +125,7 @@ global_logger(prev_logger) #------------------------------------------------------------------------------- # BEGIN 0.7 deprecations -@testset "parser syntax deprecations" begin +begin # parser syntax deprecations # #15524 # @test (@test_deprecated Meta.parse("for a=b f() end")) == :(for a=b; f() end) @test_broken length(Test.collect_test_logs(()->Meta.parse("for a=b f() end"))[1]) > 0 @@ -133,7 +133,7 @@ end # END 0.7 deprecations -@testset "tuple indexed by float deprecation" begin +begin # tuple indexed by float deprecation @test_deprecated getindex((1,), 1.0) === 1 @test_deprecated getindex((1,2), 2.0) === 2 @test Base.JLOptions().depwarn == 1 From d0906570bb56848decc863dcae649a3803693c8d Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 5 Mar 2022 15:29:59 -0500 Subject: [PATCH 17/22] LibGit2: don't use testsets in subprocessed tests to prevent print leak --- stdlib/LibGit2/test/bad_ca_roots.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stdlib/LibGit2/test/bad_ca_roots.jl b/stdlib/LibGit2/test/bad_ca_roots.jl index e4ebdc709637a..fcb840b53126c 100644 --- a/stdlib/LibGit2/test/bad_ca_roots.jl +++ b/stdlib/LibGit2/test/bad_ca_roots.jl @@ -9,7 +9,7 @@ using Test, LibGit2, NetworkOptions # if that changes, this may need to be adjusted const CAN_SET_CA_ROOTS_PATH = !Sys.isapple() && !Sys.iswindows() -@testset "empty CA roots file" begin +begin # empty CA roots file # these fail for different reasons on different platforms: # - on Apple & Windows you cannot set the CA roots path location # - on Linux & FreeBSD you you can but these are invalid files @@ -29,14 +29,14 @@ const CAN_SET_CA_ROOTS_PATH = !Sys.isapple() && !Sys.iswindows() end if CAN_SET_CA_ROOTS_PATH - @testset "non-empty but bad CA roots file" begin + begin # non-empty but bad CA roots file # should still be possible to initialize ENV["JULIA_SSL_CA_ROOTS_PATH"] = joinpath(@__DIR__, "bad_ca_roots.pem") @test LibGit2.ensure_initialized() === nothing end mktempdir() do dir repo_url = "https://github.com/JuliaLang/Example.jl" - @testset "HTTPS clone with bad CA roots fails" begin + begin # HTTPS clone with bad CA roots fails repo_path = joinpath(dir, "Example.HTTPS") c = LibGit2.CredentialPayload(allow_prompt=false, allow_git_helpers=false) redirect_stderr(devnull) From b4590df4ec753a73d03ad062d9c33cb8e5b470fd Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 5 Mar 2022 16:05:37 -0500 Subject: [PATCH 18/22] avoid method redefinition in syntax tests --- test/syntax.jl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/syntax.jl b/test/syntax.jl index 99430f90ce5f6..6a4b97ec79518 100644 --- a/test/syntax.jl +++ b/test/syntax.jl @@ -2981,15 +2981,15 @@ end end @testset "slurping into function def" begin - x, f()... = [1, 2, 3] + x, f1()... = [1, 2, 3] @test x == 1 - @test f() == [2, 3] + @test f1() == [2, 3] # test that call to `Base.rest` is outside the definition of `f` - @test f() === f() + @test f1() === f1() - x, f()... = 1, 2, 3 + x, f2()... = 1, 2, 3 @test x == 1 - @test f() == (2, 3) + @test f2() == (2, 3) end @testset "long function bodies" begin From 02c5d1d28087d822c0c4ac06af402482c39c5f00 Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 5 Mar 2022 16:07:42 -0500 Subject: [PATCH 19/22] redirect stderr around intentional method redefinition to hide warning --- test/specificity.jl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/specificity.jl b/test/specificity.jl index de65c289be02a..1a5c117ce5d9d 100644 --- a/test/specificity.jl +++ b/test/specificity.jl @@ -90,7 +90,12 @@ begin @test f((1,2,3), A) == 3 @test f((1,2), A) == 2 @test f((), reshape([1])) == 1 + + oldstderr = stderr + newstderr = redirect_stderr() # redirect stderr to avoid method definition overwrite warning f(dims::NTuple{N,Int}, A::AbstractArray{T,N}) where {T,N} = 4 + redirect_stderr(oldstderr) + @test f((1,2), A) == 4 @test f((1,2,3), A) == 3 end From 28901b78336cb26a6816e37e7f488845484d555b Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 5 Mar 2022 17:13:13 -0500 Subject: [PATCH 20/22] add note --- stdlib/LibGit2/test/bad_ca_roots.jl | 2 ++ test/deprecation_exec.jl | 2 ++ 2 files changed, 4 insertions(+) diff --git a/stdlib/LibGit2/test/bad_ca_roots.jl b/stdlib/LibGit2/test/bad_ca_roots.jl index fcb840b53126c..2bf05b26942fd 100644 --- a/stdlib/LibGit2/test/bad_ca_roots.jl +++ b/stdlib/LibGit2/test/bad_ca_roots.jl @@ -9,6 +9,8 @@ using Test, LibGit2, NetworkOptions # if that changes, this may need to be adjusted const CAN_SET_CA_ROOTS_PATH = !Sys.isapple() && !Sys.iswindows() +# Given this is a sub-processed file, not using @testsets avoids +# leaking the report print into the Base test runnner report begin # empty CA roots file # these fail for different reasons on different platforms: # - on Apple & Windows you cannot set the CA roots path location diff --git a/test/deprecation_exec.jl b/test/deprecation_exec.jl index 54c848f69b820..bd44d299e0127 100644 --- a/test/deprecation_exec.jl +++ b/test/deprecation_exec.jl @@ -46,6 +46,8 @@ end # Create a consistent call frame for nowarn tests @noinline call(f, args...) = @noinline f(args...) +# Given this is a sub-processed test file, not using @testsets avoids +# leaking the report print into the Base test runnner report begin # @deprecate using .DeprecationTests using .Foo1234 From 960eae0280d3a7f7b44faf72ce30b69f9694a3c8 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Sat, 5 Mar 2022 21:47:41 +0000 Subject: [PATCH 21/22] =?UTF-8?q?=F0=9F=A4=96=20Bump=20the=20SHA=20stdlib?= =?UTF-8?q?=20from=2057c3a8c=20to=202d1f84e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 7287e6482dea7ba54b49f32c536f551696ea5c1d) --- .../SHA-2d1f84e6f8417a1a368de48318640d948b023e7a.tar.gz/md5 | 1 + .../SHA-2d1f84e6f8417a1a368de48318640d948b023e7a.tar.gz/sha512 | 1 + .../SHA-57c3a8c8358021b7a58526364e6885768fd95de2.tar.gz/md5 | 1 - .../SHA-57c3a8c8358021b7a58526364e6885768fd95de2.tar.gz/sha512 | 1 - stdlib/SHA.version | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 deps/checksums/SHA-2d1f84e6f8417a1a368de48318640d948b023e7a.tar.gz/md5 create mode 100644 deps/checksums/SHA-2d1f84e6f8417a1a368de48318640d948b023e7a.tar.gz/sha512 delete mode 100644 deps/checksums/SHA-57c3a8c8358021b7a58526364e6885768fd95de2.tar.gz/md5 delete mode 100644 deps/checksums/SHA-57c3a8c8358021b7a58526364e6885768fd95de2.tar.gz/sha512 diff --git a/deps/checksums/SHA-2d1f84e6f8417a1a368de48318640d948b023e7a.tar.gz/md5 b/deps/checksums/SHA-2d1f84e6f8417a1a368de48318640d948b023e7a.tar.gz/md5 new file mode 100644 index 0000000000000..f682cf3518658 --- /dev/null +++ b/deps/checksums/SHA-2d1f84e6f8417a1a368de48318640d948b023e7a.tar.gz/md5 @@ -0,0 +1 @@ +de53629eb0b1ce98ac6b245bdbf14e9d diff --git a/deps/checksums/SHA-2d1f84e6f8417a1a368de48318640d948b023e7a.tar.gz/sha512 b/deps/checksums/SHA-2d1f84e6f8417a1a368de48318640d948b023e7a.tar.gz/sha512 new file mode 100644 index 0000000000000..870098ef7aada --- /dev/null +++ b/deps/checksums/SHA-2d1f84e6f8417a1a368de48318640d948b023e7a.tar.gz/sha512 @@ -0,0 +1 @@ +71cdc58b03cc4f42f8c4b9c2353d6f94d77b4ac5c9d374387d435c57ba85e966f3be4e8c8447b34e184cb8e665c42b3cd2c9d9742c86f7fb5c71a85df5087966 diff --git a/deps/checksums/SHA-57c3a8c8358021b7a58526364e6885768fd95de2.tar.gz/md5 b/deps/checksums/SHA-57c3a8c8358021b7a58526364e6885768fd95de2.tar.gz/md5 deleted file mode 100644 index 1bcc55fb297fa..0000000000000 --- a/deps/checksums/SHA-57c3a8c8358021b7a58526364e6885768fd95de2.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -96d57bc32f4f9bb8c66117c96e6243fc diff --git a/deps/checksums/SHA-57c3a8c8358021b7a58526364e6885768fd95de2.tar.gz/sha512 b/deps/checksums/SHA-57c3a8c8358021b7a58526364e6885768fd95de2.tar.gz/sha512 deleted file mode 100644 index 7f6c994b2fbb7..0000000000000 --- a/deps/checksums/SHA-57c3a8c8358021b7a58526364e6885768fd95de2.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -7243eddcccb634910f35252f30b29fe44c348955039bea56546765ab828bddb575a87603e91c89bee2619ea6e45b606c23fab2c8f4fc28c910571800732201a9 diff --git a/stdlib/SHA.version b/stdlib/SHA.version index 312fbc55ea97c..f2242a336c6fe 100644 --- a/stdlib/SHA.version +++ b/stdlib/SHA.version @@ -1,4 +1,4 @@ SHA_BRANCH = master -SHA_SHA1 = 57c3a8c8358021b7a58526364e6885768fd95de2 +SHA_SHA1 = 2d1f84e6f8417a1a368de48318640d948b023e7a SHA_GIT_URL := https://github.com/JuliaCrypto/SHA.jl.git SHA_TAR_URL = https://api.github.com/repos/JuliaCrypto/SHA.jl/tarball/$1 From 41b38d2782939c15f4e67fc815c9c51f93c33985 Mon Sep 17 00:00:00 2001 From: Ian Date: Sun, 6 Mar 2022 01:22:52 -0500 Subject: [PATCH 22/22] review suggestions --- stdlib/FileWatching/test/pidfile.jl | 2 +- stdlib/LibGit2/test/bad_ca_roots.jl | 4 ++-- test/boundscheck_exec.jl | 2 ++ test/deprecation_exec.jl | 2 +- test/misc.jl | 6 ++++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/stdlib/FileWatching/test/pidfile.jl b/stdlib/FileWatching/test/pidfile.jl index 60f067db47353..febc082518edf 100644 --- a/stdlib/FileWatching/test/pidfile.jl +++ b/stdlib/FileWatching/test/pidfile.jl @@ -21,7 +21,7 @@ Base.Filesystem.mtime(io::MemoryFile) = io.mtime # and create a test environment temp directory umask(new_mask) = ccall((@static iswindows() ? :_umask : :umask), Cint, (Cint,), new_mask) -# TODO: Use targetted @test_log tests instead of suppressing all logs to hide the expected warnings +# TODO: Use targeted @test_log tests instead of suppressing all logs to hide the expected warnings Base.CoreLogging.with_logger(Base.CoreLogging.NullLogger()) do @testset "Pidfile.jl" begin diff --git a/stdlib/LibGit2/test/bad_ca_roots.jl b/stdlib/LibGit2/test/bad_ca_roots.jl index 2bf05b26942fd..4882065167bdb 100644 --- a/stdlib/LibGit2/test/bad_ca_roots.jl +++ b/stdlib/LibGit2/test/bad_ca_roots.jl @@ -9,8 +9,8 @@ using Test, LibGit2, NetworkOptions # if that changes, this may need to be adjusted const CAN_SET_CA_ROOTS_PATH = !Sys.isapple() && !Sys.iswindows() -# Given this is a sub-processed file, not using @testsets avoids -# leaking the report print into the Base test runnner report +# Given this is a sub-processed test file, not using @testsets avoids +# leaking the report print into the Base test runner report begin # empty CA roots file # these fail for different reasons on different platforms: # - on Apple & Windows you cannot set the CA roots path location diff --git a/test/boundscheck_exec.jl b/test/boundscheck_exec.jl index 6d42adf37cb28..715700e00378f 100644 --- a/test/boundscheck_exec.jl +++ b/test/boundscheck_exec.jl @@ -259,6 +259,8 @@ if bc_opt == bc_default || bc_opt == bc_off @test !occursin("arrayref(true", typed_40281) end +# Given this is a sub-processed test file, not using @testsets avoids +# leaking the report print into the Base test runner report begin # Pass inbounds meta to getindex on CartesianIndices (#42115) @inline getindex_42115(r, i) = @inbounds getindex(r, i) @inline getindex_42115(r, i, j) = @inbounds getindex(r, i, j) diff --git a/test/deprecation_exec.jl b/test/deprecation_exec.jl index bd44d299e0127..194632279397c 100644 --- a/test/deprecation_exec.jl +++ b/test/deprecation_exec.jl @@ -47,7 +47,7 @@ end @noinline call(f, args...) = @noinline f(args...) # Given this is a sub-processed test file, not using @testsets avoids -# leaking the report print into the Base test runnner report +# leaking the report print into the Base test runner report begin # @deprecate using .DeprecationTests using .Foo1234 diff --git a/test/misc.jl b/test/misc.jl index 3e010f4282a4e..efc647667f4b6 100644 --- a/test/misc.jl +++ b/test/misc.jl @@ -349,8 +349,10 @@ end after = Base.cumulative_compile_time_ns_after(); @test after >= before; -wait(t1) -wait(t2) + +# wait for completion of these tasks before restoring stdout, to suppress their @time prints. +wait(t1); wait(t2) + end # redirect_stdout # interactive utilities