Skip to content

Commit 1fde211

Browse files
DarkIsDudeDarkIsDude
committed
✅ ignore restoreStatus in tests
Issue: CLDSRV-813
1 parent 1a213d7 commit 1fde211

File tree

1 file changed

+24
-23
lines changed

1 file changed

+24
-23
lines changed

‎tests/functional/aws-node-sdk/test/object/mpuVersion.js‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,15 @@ function checkObjMdAndUpdate(objMDBefore, objMDAfter, props) {
101101
});
102102
}
103103

104-
function clearUploadIdFromVersions(versions) {
104+
function clearUploadIdFromVersionsAndRestoreStatus(versions) {
105105
if (!versions || versions.length === 0) {
106106
return versions;
107107
}
108108

109109
for (const version of versions) {
110110
if (version.value) {
111111
version.value.uploadId = undefined;
112+
version.value.restoreStatus = undefined;
112113
}
113114
}
114115

@@ -263,7 +264,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
263264
return next(err);
264265
}),
265266
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
266-
versionsBefore = clearUploadIdFromVersions(res.Versions);
267+
versionsBefore = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
267268
return next(err);
268269
}),
269270
next => putMPUVersion(s3, bucketName, objectName, '', next),
@@ -272,7 +273,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
272273
return next(err);
273274
}),
274275
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
275-
versionsAfter = clearUploadIdFromVersions(res.Versions);
276+
versionsAfter = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
276277
return next(err);
277278
}),
278279
], err => {
@@ -304,7 +305,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
304305
return next(err);
305306
}),
306307
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
307-
versionsBefore = clearUploadIdFromVersions(res.Versions);
308+
versionsBefore = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
308309
return next(err);
309310
}),
310311
next => putMPUVersion(s3, bucketName, objectName, '', next),
@@ -313,7 +314,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
313314
return next(err);
314315
}),
315316
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
316-
versionsAfter = clearUploadIdFromVersions(res.Versions);
317+
versionsAfter = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
317318
return next(err);
318319
}),
319320
], err => {
@@ -353,7 +354,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
353354
}),
354355
next => fakeMetadataArchive(bucketName, objectName, vId, archive, next),
355356
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
356-
versionsBefore = clearUploadIdFromVersions(res.Versions);
357+
versionsBefore = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
357358
return next(err);
358359
}),
359360
next => getMetadata(bucketName, objectName, vId, (err, objMD) => {
@@ -366,7 +367,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
366367
return next(err);
367368
}),
368369
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
369-
versionsAfter = clearUploadIdFromVersions(res.Versions);
370+
versionsAfter = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
370371
return next(err);
371372
}),
372373
], err => {
@@ -405,7 +406,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
405406
}),
406407
next => fakeMetadataArchive(bucketName, objectName, vId, archive, next),
407408
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
408-
versionsBefore = clearUploadIdFromVersions(res.Versions);
409+
versionsBefore = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
409410
return next(err);
410411
}),
411412
next => getMetadata(bucketName, objectName, vId, (err, objMD) => {
@@ -418,7 +419,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
418419
return next(err);
419420
}),
420421
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
421-
versionsAfter = clearUploadIdFromVersions(res.Versions);
422+
versionsAfter = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
422423
return next(err);
423424
}),
424425
], err => {
@@ -458,7 +459,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
458459
return next(err);
459460
}),
460461
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
461-
versionsBefore = clearUploadIdFromVersions(res.Versions);
462+
versionsBefore = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
462463
return next(err);
463464
}),
464465
next => putMPUVersion(s3, bucketName, objectName, 'null', next),
@@ -467,7 +468,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
467468
return next(err);
468469
}),
469470
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
470-
versionsAfter = clearUploadIdFromVersions(res.Versions);
471+
versionsAfter = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
471472
return next(err);
472473
}),
473474
], err => {
@@ -511,7 +512,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
511512
return next(err);
512513
}),
513514
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
514-
versionsBefore = clearUploadIdFromVersions(res.Versions);
515+
versionsBefore = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
515516
next(err);
516517
}),
517518
next => putMPUVersion(s3, bucketName, objectName, vId, next),
@@ -520,7 +521,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
520521
return next(err);
521522
}),
522523
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
523-
versionsAfter = clearUploadIdFromVersions(res.Versions);
524+
versionsAfter = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
524525
return next(err);
525526
}),
526527
], err => {
@@ -567,7 +568,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
567568
return next(err);
568569
}),
569570
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
570-
versionsBefore = clearUploadIdFromVersions(res.Versions);
571+
versionsBefore = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
571572
next(err);
572573
}),
573574
next => putMPUVersion(s3, bucketName, objectName, '', next),
@@ -576,7 +577,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
576577
return next(err);
577578
}),
578579
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
579-
versionsAfter = clearUploadIdFromVersions(res.Versions);
580+
versionsAfter = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
580581
return next(err);
581582
}),
582583
], err => {
@@ -621,7 +622,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
621622
return next(err);
622623
}),
623624
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
624-
versionsBefore = clearUploadIdFromVersions(res.Versions);
625+
versionsBefore = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
625626
return next(err);
626627
}),
627628
next => putMPUVersion(s3, bucketName, objectName, vId, next),
@@ -630,7 +631,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
630631
return next(err);
631632
}),
632633
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
633-
versionsAfter = clearUploadIdFromVersions(res.Versions);
634+
versionsAfter = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
634635
return next(err);
635636
}),
636637
], err => {
@@ -670,7 +671,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
670671
}),
671672
next => fakeMetadataArchive(bucketName, objectName, vId, archive, next),
672673
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
673-
versionsBefore = clearUploadIdFromVersions(res.Versions);
674+
versionsBefore = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
674675
return next(err);
675676
}),
676677
next => getMetadata(bucketName, objectName, vId, (err, objMD) => {
@@ -683,7 +684,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
683684
return next(err);
684685
}),
685686
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
686-
versionsAfter = clearUploadIdFromVersions(res.Versions);
687+
versionsAfter = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
687688
return next(err);
688689
}),
689690
], err => {
@@ -729,7 +730,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
729730
}),
730731
next => fakeMetadataArchive(bucketName, objectName, vId, archive, next),
731732
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
732-
versionsBefore = clearUploadIdFromVersions(res.Versions);
733+
versionsBefore = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
733734
return next(err);
734735
}),
735736
next => getMetadata(bucketName, objectName, vId, (err, objMD) => {
@@ -743,7 +744,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
743744
return next(err);
744745
}),
745746
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
746-
versionsAfter = clearUploadIdFromVersions(res.Versions);
747+
versionsAfter = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
747748
return next(err);
748749
}),
749750
], err => {
@@ -777,7 +778,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
777778
next => s3.putObject(params, next),
778779
next => fakeMetadataArchive(bucketName, objectName, undefined, archive, next),
779780
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
780-
versionsBefore = clearUploadIdFromVersions(res.Versions);
781+
versionsBefore = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
781782
return next(err);
782783
}),
783784
next => getMetadata(bucketName, objectName, undefined, (err, objMD) => {
@@ -791,7 +792,7 @@ describe('MPU with x-scal-s3-version-id header', () => {
791792
return next(err);
792793
}),
793794
next => metadata.listObject(bucketName, mdListingParams, log, (err, res) => {
794-
versionsAfter = clearUploadIdFromVersions(res.Versions);
795+
versionsAfter = clearUploadIdFromVersionsAndRestoreStatus(res.Versions);
795796
return next(err);
796797
}),
797798
], err => {

0 commit comments

Comments
 (0)