Extract common sink list testslist_backups

3 files changed, 29 insertions, 41 deletions

diff --git a/internal/backup/filesystem_sink_test.go b/internal/backup/filesystem_sink_test.go
index ed467abd1..7aa018700 100644
--- a/internal/backup/filesystem_sink_test.go
+++ b/internal/backup/filesystem_sink_test.go
@@ -1,7 +1,6 @@
 package backup
 
 import (
-	"bytes"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -118,24 +117,5 @@ func TestFilesystemSink_List(t *testing.T) {
 	dir := testhelper.TempDir(t)
 	fsSink := NewFilesystemSink(dir)
 
-	data := []byte("test")
-
-	for _, relativePath := range []string{
-		"a/a_pineapple",
-		"b/a_apple",
-		"b/a_carrot",
-		"b/a_cucumber",
-	} {
-		require.NoError(t, fsSink.Write(ctx, relativePath, bytes.NewReader(data)))
-	}
-
-	expectedPaths := []string{
-		"b/a_carrot",
-		"b/a_cucumber",
-	}
-
-	paths, err := fsSink.List(ctx, "b/a_c")
-	require.NoError(t, err)
-
-	require.ElementsMatch(t, expectedPaths, paths)
+	testSinkList(ctx, t, fsSink)
 }
diff --git a/internal/backup/storage_service_sink_test.go b/internal/backup/storage_service_sink_test.go
index b3707a734..4b9dcf257 100644
--- a/internal/backup/storage_service_sink_test.go
+++ b/internal/backup/storage_service_sink_test.go
@@ -42,25 +42,6 @@ func TestStorageServiceSink(t *testing.T) {
 	})
 
 	t.Run("List", func(t *testing.T) {
-		data := []byte("test")
-
-		for _, relativePath := range []string{
-			"a/a_pineapple",
-			"b/a_apple",
-			"b/a_carrot",
-			"b/a_cucumber",
-		} {
-			require.NoError(t, sss.Write(ctx, relativePath, bytes.NewReader(data)))
-		}
-
-		expectedPaths := []string{
-			"b/a_carrot",
-			"b/a_cucumber",
-		}
-
-		paths, err := sss.List(ctx, "b/a_c")
-		require.NoError(t, err)
-
-		require.ElementsMatch(t, expectedPaths, paths)
+		testSinkList(ctx, t, sss)
 	})
 }
diff --git a/internal/backup/testhelper_test.go b/internal/backup/testhelper_test.go
index 83b1e76cd..a63cc1cd3 100644
--- a/internal/backup/testhelper_test.go
+++ b/internal/backup/testhelper_test.go
@@ -1,9 +1,12 @@
 package backup
 
 import (
+	"bytes"
+	"context"
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
 )
 
@@ -19,3 +22,27 @@ func testMain(m *testing.M) int {
 
 	return m.Run()
 }
+
+func testSinkList(ctx context.Context, t *testing.T, s Sink) {
+	data := []byte("test")
+
+	for _, relativePath := range []string{
+		"a/a_pineapple",
+		"b/a_apple",
+		"b/a_carrot",
+		"b/a_cucumber",
+		"b/banana/a_fruit",
+	} {
+		require.NoError(t, s.Write(ctx, relativePath, bytes.NewReader(data)))
+	}
+
+	expectedPaths := []string{
+		"b/a_carrot",
+		"b/a_cucumber",
+	}
+
+	paths, err := s.List(ctx, "b/a_c")
+	require.NoError(t, err)
+
+	require.ElementsMatch(t, expectedPaths, paths)
+}