Merge pull request #130 from ydb-platform/replace-strings-contains-error-message

Replaced in table/types/compare_test.go checking error by error messa…

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.11.3
+* Replaced in `table/types/compare_test.go` checking error by error message to checking with `errors.Is()`
+
 ## 3.11.2
 * Wrapped internal errors in retry operations
 

internal/table/retry.go

@@ -278,13 +278,13 @@ func retryBackoff(
 					panic("both of session and error are nil")
 				}
 				if err != nil {
-					return errors.Errorf(0, "get session from pool failed: %w", ctx.Err())
+					return errors.Errorf(0, "get session from pool failed: %w", err)
 				}
 			}
 
 			err = op(ctx, s)
 			if err != nil {
-				err = errors.Errorf(0, "retry operation failed: %w", ctx.Err())
+				err = errors.Errorf(0, "retry operation failed: %w", err)
 			}
 
 			if s.isClosing() {

retry/retry.go

@@ -122,7 +122,7 @@ func Retry(ctx context.Context, op retryOperation, opts ...retryOption) (err err
 		attempts++
 		select {
 		case <-ctx.Done():
-			return ctx.Err()
+			return errors.Errorf(0, "context done: %w", ctx.Err())
 
 		default:
 			err = op(ctx)

table/types/compare_test.go

@@ -1,9 +1,9 @@
 package types
 
 import (
-	"strings"
 	"testing"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/testutil"
 )
 
@@ -303,8 +303,8 @@ func TestIncompatiblePrimitives(t *testing.T) {
 	if err == nil {
 		t.Errorf("Error expected")
 	}
-	if !strings.Contains(err.Error(), "not comparable:") {
-		t.Errorf("Unexpected error message: %s", err.Error())
+	if !errors.Is(err, testutil.ErrNotComparable) {
+		t.Errorf("Unexpected error: %v", err)
 	}
 }
 
@@ -314,8 +314,8 @@ func TestIncompatibleTuples(t *testing.T) {
 	_, err := Compare(l, r)
 	if err == nil {
 		t.Error("Error expected")
-	} else if !strings.Contains(err.Error(), "not comparable:") {
-		t.Errorf("Unexpected error message: %s", err.Error())
+	} else if !errors.Is(err, testutil.ErrNotComparable) {
+		t.Errorf("Unexpected error: %v", err)
 	}
 }
 

testutil/compare.go

@@ -2,6 +2,7 @@ package testutil
 
 import (
 	"bytes"
+	"fmt"
 	"math/big"
 	"strings"
 
@@ -11,6 +12,8 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/value"
 )
 
+var ErrNotComparable = fmt.Errorf("not comparable")
+
 // Compare compares its operands.
 // It returns -1, 0, 1 if l < r, l == r, l > r. Returns error if types are not comparable.
 // Comparable types are all integer types, UUID, DyNumber, Float, Double, String, UTF8,
@@ -76,7 +79,7 @@ func expandTuple(v *Ydb.TypedValue) []*Ydb.TypedValue {
 }
 
 func notComparableError(l interface{}, r interface{}) error {
-	return errors.Errorf(1, "not comparable: %v and %v", l, r)
+	return errors.Errorf(1, "%w: %v and %v", ErrNotComparable, l, r)
 }
 
 func comparePrimitives(t Ydb.Type_PrimitiveTypeId, l *Ydb.Value, r *Ydb.Value) (int, error) {