Generalize exception type

In preparation for JuliaLang/julia#41885
timholy · Aug 20, 2021 · 4bb0c0b · 4bb0c0b
1 parent 6bd3433
commit 4bb0c0b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/test/pairwise.jl b/test/pairwise.jl
@@ -39,8 +39,8 @@ arbitrary_fun(x, y) = cor(x, y)
 
         @inferred pairwise(f, x, y)
 
-        @test_throws ArgumentError pairwise(f, [Int[]], [Int[]])
-        @test_throws ArgumentError pairwise!(f, zeros(1, 1), [Int[]], [Int[]])
+        @test_throws Union{ArgumentError,MethodError} pairwise(f, [Int[]], [Int[]])
+        @test_throws Union{ArgumentError,MethodError} pairwise!(f, zeros(1, 1), [Int[]], [Int[]])
 
         res = pairwise(f, [], [])
         @test size(res) == (0, 0)
@@ -144,12 +144,12 @@ arbitrary_fun(x, y) = cor(x, y)
         @test res ≅ res2 ≅ [f(xi, yi) for xi in xm, yi in ym]
 
         if VERSION >= v"1.5" # Fails with UndefVarError on Julia 1.0
-            @test_throws ArgumentError pairwise(f, xm, ym, skipmissing=:pairwise)
-            @test_throws ArgumentError pairwise(f, xm, ym, skipmissing=:listwise)
+            @test_throws Union{ArgumentError,MethodError} pairwise(f, xm, ym, skipmissing=:pairwise)
+            @test_throws Union{ArgumentError,MethodError} pairwise(f, xm, ym, skipmissing=:listwise)
 
             res = zeros(Union{Float64, Missing}, length(xm), length(ym))
-            @test_throws ArgumentError pairwise!(f, res, xm, ym, skipmissing=:pairwise)
-            @test_throws ArgumentError pairwise!(f, res, xm, ym, skipmissing=:listwise)
+            @test_throws Union{ArgumentError,MethodError} pairwise!(f, res, xm, ym, skipmissing=:pairwise)
+            @test_throws Union{ArgumentError,MethodError} pairwise!(f, res, xm, ym, skipmissing=:listwise)
         end
 
         for sm in (:pairwise, :listwise)