Skip to content

Commit cbc47c9

Browse files
authored
[Test] Improve regex matching expected test summaries (#57096)
Allow for more spaces between the "Total" and "Time" columns, in case tests take occasionally longer than usual. Fix #57095.
1 parent fa9478b commit cbc47c9

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

stdlib/Test/test/runtests.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ let msg = read(pipeline(ignorestatus(`$(Base.julia_cmd()) --startup-file=no --co
870870
end
871871
end'`), stderr=devnull), String)
872872
@test occursin(r"""
873-
Test Summary: \| Pass Fail Total Time
873+
Test Summary: \| Pass Fail Total +Time
874874
Foo Tests \| 2 2 4 \s*\d*\.\ds
875875
Animals \| 1 1 2 \s*\d*\.\ds
876876
Felines \| 1 1 \s*\d*\.\ds
@@ -1253,7 +1253,7 @@ end
12531253

12541254
@testset "verbose option" begin
12551255
expected = r"""
1256-
Test Summary: \| Pass Total Time
1256+
Test Summary: \| Pass Total +Time
12571257
Parent \| 9 9 \s*\d*\.\ds
12581258
Child 1 \| 3 3 \s*\d*\.\ds
12591259
Child 1\.1 \(long name\) \| 1 1 \s*\d*\.\ds
@@ -1324,7 +1324,7 @@ end
13241324
@testset "failfast option" begin
13251325
@testset "non failfast (default)" begin
13261326
expected = r"""
1327-
Test Summary: \| Pass Fail Error Total Time
1327+
Test Summary: \| Pass Fail Error Total +Time
13281328
Foo \| 1 2 1 4 \s*\d*\.\ds
13291329
Bar \| 1 1 2 \s*\d*\.\ds
13301330
"""
@@ -1350,7 +1350,7 @@ end
13501350
end
13511351
@testset "failfast" begin
13521352
expected = r"""
1353-
Test Summary: \| Fail Total Time
1353+
Test Summary: \| Fail Total +Time
13541354
Foo \| 1 1 \s*\d*\.\ds
13551355
"""
13561356

@@ -1375,7 +1375,7 @@ end
13751375
end
13761376
@testset "failfast passes to child testsets" begin
13771377
expected = r"""
1378-
Test Summary: \| Fail Total Time
1378+
Test Summary: \| Fail Total +Time
13791379
Foo \| 1 1 \s*\d*\.\ds
13801380
1 \| 1 1 \s*\d*\.\ds
13811381
"""
@@ -1401,7 +1401,7 @@ end
14011401
end
14021402
@testset "failfast via env var" begin
14031403
expected = r"""
1404-
Test Summary: \| Fail Total Time
1404+
Test Summary: \| Fail Total +Time
14051405
Foo \| 1 1 \s*\d*\.\ds
14061406
"""
14071407

@@ -1712,7 +1712,7 @@ end
17121712

17131713
# this tests both the `TestCounts` parts as well as the fallback `x`s
17141714
expected = r"""
1715-
Test Summary: \| Pass Fail Error Broken Total Time
1715+
Test Summary: \| Pass Fail Error Broken Total +Time
17161716
outer \| 3 1 1 1 6 \s*\d*.\ds
17171717
a \| 1 1 \s*\d*.\ds
17181718
custom \| 1 1 1 1 4 \s*\?s

0 commit comments

Comments
 (0)