From de7e8f6d023e7f3f34f5dc53150cff90a3f9f475 Mon Sep 17 00:00:00 2001 From: "siddarth.msv" Date: Thu, 12 Oct 2023 00:02:10 +0530 Subject: [PATCH] chore: fix archiver test - inconsistent number of files --- archiver/archiver_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/archiver/archiver_test.go b/archiver/archiver_test.go index 59b831844d8..7f1efbc6412 100644 --- a/archiver/archiver_test.go +++ b/archiver/archiver_test.go @@ -34,8 +34,8 @@ import ( func TestJobsArchival(t *testing.T) { var ( - prefix = trand.String(10) - minioResource []*destination.MINIOResource + prefixByWorkspace = map[int]string{0: trand.String(10), 1: trand.String(10), 2: trand.String(10)} + minioResource []*destination.MINIOResource // test data - contains jobs from 3 workspaces(1 - 1 source, 2 & 3 - 2 sources each) seedJobsFileName = "testdata/MultiWorkspaceBackupJobs.json.gz" @@ -78,7 +78,7 @@ func TestJobsArchival(t *testing.T) { Type: "MINIO", Config: map[string]interface{}{ "bucketName": minioResource[0].BucketName, - "prefix": prefix, + "prefix": prefixByWorkspace[0], "endPoint": minioResource[0].Endpoint, "accessKeyID": minioResource[0].AccessKey, "secretAccessKey": minioResource[0].SecretKey, @@ -96,7 +96,7 @@ func TestJobsArchival(t *testing.T) { Type: "MINIO", Config: map[string]interface{}{ "bucketName": minioResource[1].BucketName, - "prefix": prefix, + "prefix": prefixByWorkspace[1], "endPoint": minioResource[1].Endpoint, "accessKeyID": minioResource[1].AccessKey, "secretAccessKey": minioResource[1].SecretKey, @@ -114,7 +114,7 @@ func TestJobsArchival(t *testing.T) { Type: "MINIO", Config: map[string]interface{}{ "bucketName": minioResource[2].BucketName, - "prefix": prefix, + "prefix": prefixByWorkspace[2], "endPoint": minioResource[2].Endpoint, "accessKeyID": minioResource[2].AccessKey, "secretAccessKey": minioResource[2].SecretKey, @@ -170,7 +170,7 @@ func TestJobsArchival(t *testing.T) { workspace := "defaultWorkspaceID-" + strconv.Itoa(i+1) fm, err := fileUploaderProvider.GetFileManager(workspace) require.NoError(t, err) - fileIter := fm.ListFilesWithPrefix(context.Background(), "", prefix, 20) + fileIter := fm.ListFilesWithPrefix(context.Background(), "", prefixByWorkspace[i], 20) files, err := getAllFileNames(fileIter) require.NoError(t, err) require.Equal(t, sourcesPerWorkspace[i], len(files),