Skip to content
This repository was archived by the owner on Jan 18, 2025. It is now read-only.

Commit 0f100f8

Browse files
authored
Merge pull request JuliaLang/julia#43297 from JuliaLang/backports-release-1.7
release-1.7: Backports for 1.7.1
2 parents 857f1c0 + ea45153 commit 0f100f8

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

src/Test.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,8 +1056,8 @@ end
10561056
function get_alignment(ts::DefaultTestSet, depth::Int)
10571057
# The minimum width at this depth is
10581058
ts_width = 2*depth + length(ts.description)
1059-
# If all passing, no need to look at children
1060-
!ts.anynonpass && return ts_width
1059+
# If not verbose and all passing, no need to look at children
1060+
!ts.verbose && !ts.anynonpass && return ts_width
10611061
# Return the maximum of this width and the minimum width
10621062
# for all children (if they exist)
10631063
isempty(ts.results) && return ts_width

test/runtests.jl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,17 +1025,17 @@ end
10251025

10261026
@testset "verbose option" begin
10271027
expected = """
1028-
Test Summary: | Pass Total
1029-
Parent | 9 9
1030-
Child 1 | 3 3
1031-
Child 1.1 | 1 1
1032-
Child 1.2 | 1 1
1033-
Child 1.3 | 1 1
1034-
Child 2 | 3 3
1035-
Child 3 | 3 3
1036-
Child 3.1 | 1 1
1037-
Child 3.2 | 1 1
1038-
Child 3.3 | 1 1
1028+
Test Summary: | Pass Total
1029+
Parent | 9 9
1030+
Child 1 | 3 3
1031+
Child 1.1 (long name) | 1 1
1032+
Child 1.2 | 1 1
1033+
Child 1.3 | 1 1
1034+
Child 2 | 3 3
1035+
Child 3 | 3 3
1036+
Child 3.1 | 1 1
1037+
Child 3.2 | 1 1
1038+
Child 3.3 | 1 1
10391039
"""
10401040

10411041
mktemp() do f, _
@@ -1045,7 +1045,7 @@ end
10451045
10461046
@testset "Parent" verbose = true begin
10471047
@testset "Child 1" verbose = true begin
1048-
@testset "Child 1.1" begin
1048+
@testset "Child 1.1 (long name)" begin
10491049
@test 1 == 1
10501050
end
10511051

0 commit comments

Comments
 (0)