Skip to content

Commit 1f64b9f

Browse files
authored
[Storage] [DataMovement] Re-enable flakey pause/resume E2E tests (Azure#47812)
* change tests to LiveOnly * use OAuth for blobProvider + add more delay for pause * Do not fail test if transfer Completes before Pause is issued in ResumeTransferAsync_Directory_Large * merged main * disable ResumeTransferAsync_Directory_Large * extend cancellation time limit * add tiny delay between start transfer and pause * decreased delay * accounted for if transfer completes before pause + lowered asserts * small * adjust cancel time * added AssertContainerCompleted * small complete assert * Added retry * More chunks = hopefully slower transfer * reduced delay * pause hang fix * revert * Resolved bug where resumed single resource transfer can be enumerated * minor test changes * do not allow single resource transfers to be enumerated * revert * merge conflict resolution * temp disable ResumeTransferAsync_Options * Fix for jobPlanFile length bug * lowered the cancellation time to 150ms
1 parent c0d94bd commit 1f64b9f

File tree

4 files changed

+72
-77
lines changed

4 files changed

+72
-77
lines changed

sdk/storage/Azure.Storage.DataMovement.Blobs/src/BlobDestinationCheckpointDetails.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public BlobDestinationCheckpointDetails(
127127

128128
ContentEncoding = contentEncoding;
129129
IsContentEncodingSet = isContentEncodingSet;
130-
ContentEncodingBytes = contentEncoding!= default ? Encoding.UTF8.GetBytes(contentEncoding) : Array.Empty<byte>();
130+
ContentEncodingBytes = contentEncoding != default ? Encoding.UTF8.GetBytes(contentEncoding) : Array.Empty<byte>();
131131

132132
ContentLanguage = contentLanguage;
133133
IsContentLanguageSet = isContentLanguageSet;
@@ -434,27 +434,27 @@ private int CalculateLength()
434434
// Length is calculated based on whether the property is preserved.
435435
// If the property is preserved, the property's length is added to the total length.
436436
int length = DataMovementBlobConstants.DestinationCheckpointDetails.VariableLengthStartIndex;
437-
if (!IsContentTypeSet)
437+
if (IsContentTypeSet)
438438
{
439439
length += ContentTypeBytes.Length;
440440
}
441-
if (!IsContentEncodingSet)
441+
if (IsContentEncodingSet)
442442
{
443443
length += ContentEncodingBytes.Length;
444444
}
445-
if (!IsContentLanguageSet)
445+
if (IsContentLanguageSet)
446446
{
447447
length += ContentLanguageBytes.Length;
448448
}
449-
if (!IsContentDispositionSet)
449+
if (IsContentDispositionSet)
450450
{
451451
length += ContentDispositionBytes.Length;
452452
}
453-
if (!IsCacheControlSet)
453+
if (IsCacheControlSet)
454454
{
455455
length += CacheControlBytes.Length;
456456
}
457-
if (!IsMetadataSet)
457+
if (IsMetadataSet)
458458
{
459459
length += MetadataBytes.Length;
460460
}

0 commit comments

Comments
 (0)