Merge pull request #1398 from JuliaDocs/mp/nightlytests

Fix the nightly tests
JuliaDocs · Aug 13, 2020 · faace88 · faace88
2 parents 9d3beef + 0b99f6a
commit faace88
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 64 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,7 +1,7 @@
 environment:
   matrix:
   - julia_version: 1.0
-  - julia_version: 1.4
+  - julia_version: 1.5
   - julia_version: nightly
 
 platform:

diff --git a/test/doctests/doctests.jl b/test/doctests/doctests.jl
@@ -73,7 +73,7 @@ function onormalize(s)
     s = replace(s, r"(@ Documenter.DocTests )(.*)$"m => s"\1{PATH}")
 
     # Remove stacktraces
-    s = replace(s, r"(│\s+Stacktrace:)(\n(│\s+)\[[0-9]+\].*)+" => s"\1\\n\3{STACKTRACE}")
+    s = replace(s, r"(│\s+Stacktrace:)(\n(│\s+)\[[0-9]+\].*)(\n(│\s+)@.*)?+" => s"\1\\n\3{STACKTRACE}")
 
     return s
 end

diff --git a/test/doctests/fix/broken.jl b/test/doctests/fix/broken.jl
@@ -1,44 +1,45 @@
 module Foo
 """
 ```jldoctest
-julia> Int64[1, 2, 3, 4] * 2
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  1
  2
  3
  4
 
-julia> Int64[1, 2, 3, 4]
+julia> reshape(Int64[1, 2, 3, 4], (4,1,1))
 4-element Array{Int64,1}:
  1
  2
  3
  4
 ```
 ```jldoctest
-julia> Int64[1, 2, 3, 4]
+julia> reshape(Int64[1, 2, 3, 4], (4,1,1))
 4-element Array{Int64,1}:
  1
  2
  3
  4
 
-julia> Int64[1, 2, 3, 4] * 2
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
 4-element Array{Int64,1}:
  1
  2
  3
  4
 ```
 ```jldoctest
-julia> Int64[1, 2, 3, 4] * 2
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
 4-element Array{Int64,1}:
  1
  2
  3
  4
 
-julia> Int64[1, 2, 3, 4] * 2
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
 4-element Array{Int64,1}:
  1
  2
@@ -47,7 +48,7 @@ julia> Int64[1, 2, 3, 4] * 2
 ```
 ```jldoctest
 julia> begin
-          Int64[1, 2, 3, 4] * 2
+           reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
        end
 4-element Array{Int64,1}:
  1
@@ -56,7 +57,7 @@ julia> begin
  4
 ```
 ```jldoctest
-Int64[1, 2, 3, 4] * 2
+reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
 
 # output
 
@@ -81,7 +82,7 @@ foo() = 1
     """
     ```jldoctest
     julia> begin
-              Int64[1, 2, 3, 4] * 2
+               reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
            end
     4-element Array{Int64,1}:
      1

diff --git a/test/doctests/fix/broken.md b/test/doctests/fix/broken.md
@@ -3,44 +3,45 @@ DocTestFixTest.Foo.foo
 ```
 
 ```jldoctest
-julia> Int64[1, 2, 3, 4] * 2
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  1
  2
  3
  4
 
-julia> Int64[1, 2, 3, 4]
+julia> reshape(Int64[1, 2, 3, 4], (4,1,1))
 4-element Array{Int64,1}:
  1
  2
  3
  4
 ```
 ```jldoctest
-julia> Int64[1, 2, 3, 4]
+julia> reshape(Int64[1, 2, 3, 4], (4,1,1))
 4-element Array{Int64,1}:
  1
  2
  3
  4
 
-julia> Int64[1, 2, 3, 4] * 2
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
 4-element Array{Int64,1}:
  1
  2
  3
  4
 ```
 ```jldoctest
-julia> Int64[1, 2, 3, 4] * 2
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
 4-element Array{Int64,1}:
  1
  2
  3
  4
 
-julia> Int64[1, 2, 3, 4] * 2
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
 4-element Array{Int64,1}:
  1
  2
@@ -49,7 +50,7 @@ julia> Int64[1, 2, 3, 4] * 2
 ```
 ```jldoctest
 julia> begin
-          Int64[1, 2, 3, 4] * 2
+          reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
        end
 4-element Array{Int64,1}:
  1
@@ -58,7 +59,7 @@ julia> begin
  4
 ```
 ```jldoctest
-Int64[1, 2, 3, 4] * 2
+reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
 
 # output
 

diff --git a/test/doctests/fix/fixed.jl b/test/doctests/fix/fixed.jl
@@ -1,66 +1,74 @@
 module Foo
 """
 ```jldoctest
-julia> Int64[1, 2, 3, 4] * 2
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6
  8
 
-julia> Int64[1, 2, 3, 4]
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4], (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  1
  2
  3
  4
 ```
 ```jldoctest
-julia> Int64[1, 2, 3, 4]
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4], (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  1
  2
  3
  4
 
-julia> Int64[1, 2, 3, 4] * 2
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6
  8
 ```
 ```jldoctest
-julia> Int64[1, 2, 3, 4] * 2
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6
  8
 
-julia> Int64[1, 2, 3, 4] * 2
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6
  8
 ```
 ```jldoctest
 julia> begin
-          Int64[1, 2, 3, 4] * 2
+           reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
        end
-4-element Array{Int64,1}:
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6
  8
 ```
 ```jldoctest
-Int64[1, 2, 3, 4] * 2
+reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
 
 # output
 
-4-element Array{Int64,1}:
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6
@@ -83,9 +91,10 @@ foo() = 1
     """
     ```jldoctest
     julia> begin
-              Int64[1, 2, 3, 4] * 2
+               reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
            end
-    4-element Array{Int64,1}:
+    4×1×1 Array{Int64,3}:
+    [:, :, 1] =
      2
      4
      6

diff --git a/test/doctests/fix/fixed.md b/test/doctests/fix/fixed.md
@@ -3,66 +3,74 @@ DocTestFixTest.Foo.foo
 ```
 
 ```jldoctest
-julia> Int64[1, 2, 3, 4] * 2
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6
  8
 
-julia> Int64[1, 2, 3, 4]
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4], (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  1
  2
  3
  4
 ```
 ```jldoctest
-julia> Int64[1, 2, 3, 4]
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4], (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  1
  2
  3
  4
 
-julia> Int64[1, 2, 3, 4] * 2
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6
  8
 ```
 ```jldoctest
-julia> Int64[1, 2, 3, 4] * 2
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6
  8
 
-julia> Int64[1, 2, 3, 4] * 2
-4-element Array{Int64,1}:
+julia> reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6
  8
 ```
 ```jldoctest
 julia> begin
-          Int64[1, 2, 3, 4] * 2
+          reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
        end
-4-element Array{Int64,1}:
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6
  8
 ```
 ```jldoctest
-Int64[1, 2, 3, 4] * 2
+reshape(Int64[1, 2, 3, 4] * 2, (4,1,1))
 
 # output
 
-4-element Array{Int64,1}:
+4×1×1 Array{Int64,3}:
+[:, :, 1] =
  2
  4
  6

diff --git a/test/doctests/fix/tests.jl b/test/doctests/fix/tests.jl
@@ -2,8 +2,10 @@
 #
 # DOCUMENTER_TEST_DEBUG= JULIA_DEBUG=all julia test/doctests/fix/tests.jl
 #
+isdefined(@__MODULE__, :TestUtilities) || (include("../../TestUtilities.jl"); using .TestUtilities)
 module DocTestFixTest
 using Documenter, Test
+using ..TestUtilities: @quietly
 
 function test_doctest_fix(dir)
     srcdir = mktempdir(dir)
@@ -30,15 +32,12 @@ function test_doctest_fix(dir)
     @test read(joinpath(srcdir, "src.jl"), String) == read(joinpath(@__DIR__, "fixed.jl"), String)
 end
 
-println("="^50)
-@info("Testing `doctest = :fix`")
+@info "Testing `doctest = :fix` in $(@__FILE__)"
 if haskey(ENV, "DOCUMENTER_TEST_DEBUG")
     # in this mode the directories remain
     test_doctest_fix(mktempdir(@__DIR__))
 else
-    mktempdir(test_doctest_fix, @__DIR__)
+    @quietly mktempdir(test_doctest_fix, @__DIR__)
 end
-@info("Done testing `doctest = :fix`")
-println("="^50)
 
 end # module