Improve Async error handling in the case of wrapped errors (#564)

arangodb · Oct 24, 2023 · 4e88e7d · 4e88e7d
1 parent e1d3e4f
commit 4e88e7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/test/cursor_test.go b/test/cursor_test.go
@@ -51,7 +51,7 @@ func TestCreateCursorWithMaxRuntime(t *testing.T) {
 			Name:          "Too long query interrupted",
 			SleepQuery:    "1",
 			MaxRuntime:    0.01,
-			ExpectedError: "query killed (while executing)",
+			ExpectedError: "query killed",
 		},
 		{
 			Name:       "Query passed before max runtime",

diff --git a/util/connection/wrappers/async/async_errors.go b/util/connection/wrappers/async/async_errors.go
@@ -21,6 +21,7 @@
 package async
 
 import (
+	"errors"
 	"fmt"
 )
 
@@ -29,7 +30,8 @@ func IsAsyncJobInProgress(err error) (string, bool) {
 		return "", false
 	}
 
-	if v, ok := err.(ErrorAsyncJobInProgress); ok {
+	var v ErrorAsyncJobInProgress
+	if errors.As(err, &v) {
 		return v.jobID, true
 	}
 	return "", false