tests: Improve test_throws_unwrap error comparisons

Author: jpsamaroo

test/thunk.jl

@@ -69,7 +69,7 @@ end
         A = rand(4, 4)
         @test fetch(@spawn sum(A; dims=1)) ≈ sum(A; dims=1)
 
-        @test_throws_unwrap Dagger.ThunkFailedException fetch(@spawn sum(A; fakearg=2))
+        @test_throws_unwrap (Dagger.ThunkFailedException, MethodError) fetch(@spawn sum(A; fakearg=2))
 
         @test fetch(@spawn reduce(+, A; dims=1, init=2.0)) ≈
               reduce(+, A; dims=1, init=2.0)
@@ -187,7 +187,7 @@ end
             a = @spawn error("Test")
             wait(a)
             @test isready(a)
-            @test_throws_unwrap Dagger.ThunkFailedException fetch(a)
+            @test_throws_unwrap (Dagger.ThunkFailedException, ErrorException) fetch(a)
             b = @spawn 1+2
             @test fetch(b) == 3
         end
@@ -219,36 +219,36 @@ end
         @testset "single dependent" begin
             a = @spawn error("Test")
             b = @spawn a+2
-            @test_throws_unwrap Dagger.ThunkFailedException fetch(a)
+            @test_throws_unwrap (Dagger.ThunkFailedException, ErrorException) fetch(a)
         end
         @testset "multi dependent" begin
             a = @spawn error("Test")
             b = @spawn a+2
             c = @spawn a*2
-            @test_throws_unwrap Dagger.ThunkFailedException fetch(b)
-            @test_throws_unwrap Dagger.ThunkFailedException fetch(c)
+            @test_throws_unwrap (Dagger.ThunkFailedException, ErrorException) fetch(b)
+            @test_throws_unwrap (Dagger.ThunkFailedException, ErrorException) fetch(c)
         end
         @testset "dependent chain" begin
             a = @spawn error("Test")
-            @test_throws_unwrap Dagger.ThunkFailedException fetch(a)
+            @test_throws_unwrap (Dagger.ThunkFailedException, ErrorException) fetch(a)
             b = @spawn a+1
-            @test_throws_unwrap Dagger.ThunkFailedException fetch(b)
+            @test_throws_unwrap (Dagger.ThunkFailedException, ErrorException) fetch(b)
             c = @spawn b+2
-            @test_throws_unwrap Dagger.ThunkFailedException fetch(c)
+            @test_throws_unwrap (Dagger.ThunkFailedException, ErrorException) fetch(c)
         end
         @testset "single input" begin
             a = @spawn 1+1
             b = @spawn (a->error("Test"))(a)
             @test fetch(a) == 2
-            @test_throws_unwrap Dagger.ThunkFailedException fetch(b)
+            @test_throws_unwrap (Dagger.ThunkFailedException, ErrorException) fetch(b)
         end
         @testset "multi input" begin
             a = @spawn 1+1
             b = @spawn 2*2
             c = @spawn ((a,b)->error("Test"))(a,b)
             @test fetch(a) == 2
             @test fetch(b) == 4
-            @test_throws_unwrap Dagger.ThunkFailedException fetch(c)
+            @test_throws_unwrap (Dagger.ThunkFailedException, ErrorException) fetch(c)
         end
         @testset "diamond" begin
             a = @spawn 1+1
@@ -258,7 +258,7 @@ end
             @test fetch(a) == 2
             @test fetch(b) == 3
             @test fetch(c) == 4
-            @test_throws_unwrap Dagger.ThunkFailedException fetch(d)
+            @test_throws_unwrap (Dagger.ThunkFailedException, ErrorException) fetch(d)
         end
     end
     @testset "remote spawn" begin
@@ -276,7 +276,7 @@ end
             t1 = Dagger.@spawn 1+"fail"
             Dagger.@spawn t1+1
         end
-        @test_throws_unwrap Dagger.ThunkFailedException fetch(t2)
+        @test_throws_unwrap (Dagger.ThunkFailedException, ErrorException) fetch(t2)
     end
     @testset "undefined function" begin
         # Issues #254, #255

test/util.jl

@@ -14,7 +14,7 @@ end
 replace_obj!(ex::Symbol, obj) = Expr(:(.), obj, QuoteNode(ex))
 replace_obj!(ex, obj) = ex
 function _test_throws_unwrap(terr, ex; to_match=[])
-    @gensym rerr
+    @gensym oerr rerr
     match_expr = Expr(:block)
     for m in to_match
         if m.head == :(=)
@@ -35,12 +35,17 @@ function _test_throws_unwrap(terr, ex; to_match=[])
         end
     end
     quote
-        $rerr = try
+        $oerr, $rerr = try
             $(esc(ex))
         catch err
-            Dagger.Sch.unwrap_nested_exception(err)
+            (err, Dagger.Sch.unwrap_nested_exception(err))
+        end
+        if $terr isa Exception
+            @test $rerr isa $terr
+        else $terr isa Tuple
+            @test $oerr isa $terr[1]
+            @test $rerr isa $terr[2]
         end
-        @test $rerr isa $terr
         $match_expr
     end
 end