From 5a69da3f22b37fedbc9ab6e7167c274fe351ae68 Mon Sep 17 00:00:00 2001
From: Rishi Jat <rishijat098@gmail.com>
Date: Wed, 11 Mar 2026 07:37:35 +0530
Subject: [PATCH 1/2] test(retry): add tests for retry logic

Signed-off-by: Rishi Jat <rishijat098@gmail.com>
---
 pkg/backend/retry_test.go | 96 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 pkg/backend/retry_test.go

diff --git a/pkg/backend/retry_test.go b/pkg/backend/retry_test.go
new file mode 100644
index 0000000..dba50a2
--- /dev/null
+++ b/pkg/backend/retry_test.go
@@ -0,0 +1,96 @@
+/*
+ *     Copyright 2025 The CNAI Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package backend
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	retry "github.com/avast/retry-go/v4"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// testRetryOpts overrides defaultRetryOpts with no delay for fast tests.
+func testRetryOpts(ctx context.Context, maxAttempts uint) []retry.Option {
+	return []retry.Option{
+		retry.Attempts(maxAttempts),
+		retry.Delay(0),
+		retry.MaxDelay(0),
+		retry.Context(ctx),
+	}
+}
+
+func TestRetrySuccessAfterFailures(t *testing.T) {
+	ctx := context.Background()
+	attempts := 0
+
+	err := retry.Do(func() error {
+		attempts++
+		if attempts < 3 {
+			return errors.New("temporary failure")
+		}
+		return nil
+	}, testRetryOpts(ctx, 6)...)
+
+	require.NoError(t, err)
+	assert.Equal(t, 3, attempts)
+}
+
+func TestRetryMaxAttemptsExceeded(t *testing.T) {
+	ctx := context.Background()
+	attempts := 0
+	maxAttempts := uint(4)
+
+	err := retry.Do(func() error {
+		attempts++
+		return errors.New("persistent failure")
+	}, testRetryOpts(ctx, maxAttempts)...)
+
+	assert.Error(t, err)
+	assert.Equal(t, int(maxAttempts), attempts)
+}
+
+func TestRetryStopsOnContextCancel(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	attempts := 0
+
+	err := retry.Do(func() error {
+		attempts++
+		if attempts == 2 {
+			cancel()
+		}
+		return errors.New("temporary failure")
+	}, testRetryOpts(ctx, 10)...)
+
+	assert.Error(t, err)
+	assert.True(t, attempts >= 2, "should have attempted at least 2 times")
+}
+
+func TestRetrySucceedsOnFirstAttempt(t *testing.T) {
+	ctx := context.Background()
+	attempts := 0
+
+	err := retry.Do(func() error {
+		attempts++
+		return nil
+	}, testRetryOpts(ctx, 6)...)
+
+	require.NoError(t, err)
+	assert.Equal(t, 1, attempts)
+}

From f7634185a16bc05b6015086ed80334aeb52846e9 Mon Sep 17 00:00:00 2001
From: Rishi Jat <rishijat098@gmail.com>
Date: Wed, 11 Mar 2026 08:58:16 +0530
Subject: [PATCH 2/2] address copilot review

Signed-off-by: Rishi Jat <rishijat098@gmail.com>
---
 pkg/backend/retry_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/backend/retry_test.go b/pkg/backend/retry_test.go
index dba50a2..f4069ac 100644
--- a/pkg/backend/retry_test.go
+++ b/pkg/backend/retry_test.go
@@ -26,7 +26,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// testRetryOpts overrides defaultRetryOpts with no delay for fast tests.
+// testRetryOpts creates retry options with zero delay so tests run fast and deterministically.
 func testRetryOpts(ctx context.Context, maxAttempts uint) []retry.Option {
 	return []retry.Option{
 		retry.Attempts(maxAttempts),
@@ -78,8 +78,8 @@ func TestRetryStopsOnContextCancel(t *testing.T) {
 		return errors.New("temporary failure")
 	}, testRetryOpts(ctx, 10)...)
 
-	assert.Error(t, err)
-	assert.True(t, attempts >= 2, "should have attempted at least 2 times")
+	assert.ErrorIs(t, err, context.Canceled)
+	assert.Equal(t, 2, attempts)
 }
 
 func TestRetrySucceedsOnFirstAttempt(t *testing.T) {