Skip to content

[Storage][DataMovement] Add a small delay before asserting job status events #36636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 31, 2023
Merged

[Storage][DataMovement] Add a small delay before asserting job status events #36636

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02e671c
Add a small delay before seerting job status events
jalauzon-msft May 30, 2023
b1f1ee4
Fix
jalauzon-msft May 30, 2023
0fb9233
Fix one other test
jalauzon-msft May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions sdk/storage/Azure.Storage.DataMovement/tests/PauseResumeTransferTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ public async Task TryPauseTransferAsync_Id(TransferType transferType)
await transferManager.PauseTransferIfRunningAsync(transfer.Id, cancellationTokenSource.Token);

// Assert
testEventsRaised.AssertPausedCheck();
await testEventsRaised.AssertPausedCheck();
Assert.AreEqual(StorageTransferStatus.Paused, transfer.TransferStatus);

// Check if Job Plan File exists in checkpointer path.
Expand Down Expand Up @@ -312,7 +312,7 @@ public async Task TryPauseTransferAsync_DataTransfer(TransferType transferType)
await transferManager.PauseTransferIfRunningAsync(transfer, cancellationTokenSource.Token);

// Assert
testEventsRaised.AssertPausedCheck();
await testEventsRaised.AssertPausedCheck();
Assert.AreEqual(StorageTransferStatus.Paused, transfer.TransferStatus);

// Check if Job Plan File exists in checkpointer path.
Expand Down Expand Up @@ -377,7 +377,7 @@ public async Task TryPauseTransferAsync_AlreadyPaused(TransferType transferType)
await transferManager.PauseTransferIfRunningAsync(transfer, cancellationTokenSource.Token);

// Assert
testEventsRaised.AssertPausedCheck();
await testEventsRaised.AssertPausedCheck();
Assert.AreEqual(StorageTransferStatus.Paused, transfer.TransferStatus);

CancellationTokenSource cancellationTokenSource2 = new CancellationTokenSource(TimeSpan.FromSeconds(10));
Expand Down Expand Up @@ -440,7 +440,7 @@ public async Task PauseThenResumeTransferAsync(TransferType transferType)

// Assert - Confirm we've paused
Assert.AreEqual(StorageTransferStatus.Paused, transfer.TransferStatus);
testEventsRaised.AssertPausedCheck();
await testEventsRaised.AssertPausedCheck();

// Act - Resume Job
TransferOptions resumeOptions = new TransferOptions()
Expand All @@ -458,7 +458,7 @@ public async Task PauseThenResumeTransferAsync(TransferType transferType)
await resumeTransfer.AwaitCompletion(waitTransferCompletion.Token);

// Assert
testEventRaised2.AssertContainerCompletedCheck(1);
await testEventRaised2.AssertContainerCompletedCheck(1);
Assert.AreEqual(StorageTransferStatus.Completed, resumeTransfer.TransferStatus);
Assert.IsTrue(resumeTransfer.HasCompleted);

Expand Down Expand Up @@ -650,7 +650,7 @@ public async Task TryPauseTransferAsync_Id_Directory(TransferType transferType)
await transferManager.PauseTransferIfRunningAsync(transfer.Id, cancellationTokenSource.Token);

// Assert
testEventsRaised.AssertPausedCheck();
await testEventsRaised.AssertPausedCheck();
Assert.AreEqual(StorageTransferStatus.Paused, transfer.TransferStatus);
}

Expand Down Expand Up @@ -696,7 +696,7 @@ public async Task TryPauseTransferAsync_DataTransfer_Directory(TransferType tran
await transferManager.PauseTransferIfRunningAsync(transfer, cancellationTokenSource.Token);

// Assert
testEventsRaised.AssertPausedCheck();
await testEventsRaised.AssertPausedCheck();
Assert.AreEqual(StorageTransferStatus.Paused, transfer.TransferStatus);
}

Expand Down Expand Up @@ -742,13 +742,13 @@ public async Task TryPauseTransferAsync_AlreadyPaused_Directory(TransferType tra
await transferManager.PauseTransferIfRunningAsync(transfer, cancellationTokenSource.Token);

// Assert
testEventsRaised.AssertPausedCheck();
await testEventsRaised.AssertPausedCheck();
Assert.AreEqual(StorageTransferStatus.Paused, transfer.TransferStatus);

CancellationTokenSource cancellationTokenSource2 = new CancellationTokenSource(TimeSpan.FromSeconds(10));
await transferManager.PauseTransferIfRunningAsync(transfer, cancellationTokenSource2.Token);

testEventsRaised.AssertPausedCheck();
await testEventsRaised.AssertPausedCheck();
Assert.AreEqual(StorageTransferStatus.Paused, transfer.TransferStatus);
}

Expand Down Expand Up @@ -802,7 +802,7 @@ public async Task PauseThenResumeTransferAsync_Directory(TransferType transferTy

// Assert - Confirm we've paused
Assert.AreEqual(StorageTransferStatus.Paused, transfer.TransferStatus);
testEventsRaised.AssertPausedCheck();
await testEventsRaised.AssertPausedCheck();

// Act - Resume Job
TransferOptions resumeOptions = new TransferOptions()
Expand All @@ -821,7 +821,7 @@ public async Task PauseThenResumeTransferAsync_Directory(TransferType transferTy
await resumeTransfer.AwaitCompletion(waitTransferCompletion.Token);

// Assert
testEventsRaised2.AssertContainerCompletedCheck(100);
await testEventsRaised2.AssertContainerCompletedCheck(100);
Assert.AreEqual(StorageTransferStatus.Completed, resumeTransfer.TransferStatus);
Assert.IsTrue(resumeTransfer.HasCompleted);

Expand Down
14 changes: 7 additions & 7 deletions sdk/storage/Azure.Storage.DataMovement/tests/StartTransferAsyncCopyDirectoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private async Task CopyBlobDirectoryAndVerify(
CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTimeInSec));
await transfer.AwaitCompletion(tokenSource.Token);

testEventRaised.AssertContainerCompletedCheck(sourceFiles.Count);
await testEventRaised.AssertContainerCompletedCheck(sourceFiles.Count);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.Completed, transfer.TransferStatus);

Expand Down Expand Up @@ -576,7 +576,7 @@ public async Task StartTransfer_AwaitCompletion()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.Completed, transfer.TransferStatus);
testEventRaised.AssertContainerCompletedCheck(4);
await testEventRaised.AssertContainerCompletedCheck(4);
}

[Test]
Expand Down Expand Up @@ -608,7 +608,7 @@ public async Task StartTransfer_AwaitCompletion_Failed()
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithFailedTransfers, transfer.TransferStatus);
Assert.IsTrue(testEventRaised.FailedEvents.First().Exception.Message.Contains("BlobAlreadyExists"));
testEventRaised.AssertContainerCompletedWithFailedCheck(1);
await testEventRaised.AssertContainerCompletedWithFailedCheck(1);
}

[Test]
Expand Down Expand Up @@ -640,7 +640,7 @@ public async Task StartTransfer_AwaitCompletion_Skipped()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithSkippedTransfers, transfer.TransferStatus);
testEventRaised.AssertContainerCompletedWithSkippedCheck(1);
await testEventRaised.AssertContainerCompletedWithSkippedCheck(1);
}

[Test]
Expand All @@ -663,7 +663,7 @@ public async Task StartTransfer_EnsureCompleted()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.Completed, transfer.TransferStatus);
testEventRaised.AssertContainerCompletedCheck(4);
await testEventRaised.AssertContainerCompletedCheck(4);
}

[Test]
Expand Down Expand Up @@ -695,7 +695,7 @@ public async Task StartTransfer_EnsureCompleted_Failed()
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithFailedTransfers, transfer.TransferStatus);
Assert.IsTrue(testEventRaised.FailedEvents.First().Exception.Message.Contains("BlobAlreadyExists"));
testEventRaised.AssertContainerCompletedWithFailedCheck(1);
await testEventRaised.AssertContainerCompletedWithFailedCheck(1);
}

[Test]
Expand Down Expand Up @@ -727,7 +727,7 @@ public async Task StartTransfer_EnsureCompleted_Skipped()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithSkippedTransfers, transfer.TransferStatus);
testEventRaised.AssertContainerCompletedWithSkippedCheck(1);
await testEventRaised.AssertContainerCompletedWithSkippedCheck(1);
}
#endregion
}
Expand Down
14 changes: 7 additions & 7 deletions sdk/storage/Azure.Storage.DataMovement/tests/StartTransferDownloadDirectoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private async Task DownloadBlobDirectoryAndVerify(
CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTimeInSec));
await transfer.AwaitCompletion(tokenSource.Token);

testEventsRaised.AssertContainerCompletedCheck(sourceFiles.Count);
await testEventsRaised.AssertContainerCompletedCheck(sourceFiles.Count);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.Completed, transfer.TransferStatus);

Expand Down Expand Up @@ -516,7 +516,7 @@ public async Task StartTransfer_AwaitCompletion()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.Completed, transfer.TransferStatus);
testEventsRaised.AssertContainerCompletedCheck(4);
await testEventsRaised.AssertContainerCompletedCheck(4);
}

[Test]
Expand Down Expand Up @@ -553,7 +553,7 @@ public async Task StartTransfer_AwaitCompletion_Failed()
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithFailedTransfers, transfer.TransferStatus);
Assert.IsTrue(testEventsRaised.FailedEvents.First().Exception.Message.Contains("Cannot overwrite file."));
testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
await testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
}

[Test]
Expand Down Expand Up @@ -590,7 +590,7 @@ public async Task StartTransfer_AwaitCompletion_Skipped()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithSkippedTransfers, transfer.TransferStatus);
testEventsRaised.AssertContainerCompletedWithSkippedCheck(1);
await testEventsRaised.AssertContainerCompletedWithSkippedCheck(1);
}

[Test]
Expand Down Expand Up @@ -620,7 +620,7 @@ public async Task StartTransfer_EnsureCompleted()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.Completed, transfer.TransferStatus);
testEventsRaised.AssertContainerCompletedCheck(4);
await testEventsRaised.AssertContainerCompletedCheck(4);
}

[Test]
Expand Down Expand Up @@ -657,7 +657,7 @@ public async Task StartTransfer_EnsureCompleted_Failed()
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithFailedTransfers, transfer.TransferStatus);
Assert.IsTrue(testEventsRaised.FailedEvents.First().Exception.Message.Contains("Cannot overwrite file."));
testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
await testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
}

[Test]
Expand Down Expand Up @@ -694,7 +694,7 @@ public async Task StartTransfer_EnsureCompleted_Skipped()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithSkippedTransfers, transfer.TransferStatus);
testEventsRaised.AssertContainerCompletedWithSkippedCheck(1);
await testEventsRaised.AssertContainerCompletedWithSkippedCheck(1);
}
#endregion
}
Expand Down
8 changes: 4 additions & 4 deletions sdk/storage/Azure.Storage.DataMovement/tests/StartTransferSyncCopyDirectoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private async Task CopyBlobDirectoryAndVerify(
CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTimeInSec));
await transfer.AwaitCompletion(tokenSource.Token);

testEventFailed.AssertContainerCompletedCheck(sourceFiles.Count);
await testEventFailed.AssertContainerCompletedCheck(sourceFiles.Count);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.Completed, transfer.TransferStatus);

Expand Down Expand Up @@ -572,7 +572,7 @@ public async Task StartTransfer_AwaitCompletion_Failed()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithFailedTransfers, transfer.TransferStatus);
testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
await testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
Assert.IsTrue(testEventsRaised.FailedEvents.First().Exception.Message.Contains("BlobAlreadyExists"));
}

Expand Down Expand Up @@ -605,7 +605,7 @@ public async Task StartTransfer_AwaitCompletion_Skipped()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithSkippedTransfers, transfer.TransferStatus);
testEventsRaised.AssertContainerCompletedWithSkippedCheck(1);
await testEventsRaised.AssertContainerCompletedWithSkippedCheck(1);
}

[Test]
Expand Down Expand Up @@ -660,7 +660,7 @@ public async Task StartTransfer_EnsureCompleted_Failed()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithFailedTransfers, transfer.TransferStatus);
testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
await testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
Assert.IsTrue(testEventsRaised.FailedEvents.First().Exception.Message.Contains("BlobAlreadyExists"));
}

Expand Down
20 changes: 10 additions & 10 deletions sdk/storage/Azure.Storage.DataMovement/tests/StartTransferUploadDirectoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private async Task UploadBlobDirectoryAndVerify(
CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTimeInSec));
await transfer.AwaitCompletion(tokenSource.Token);

testEventsRaised.AssertContainerCompletedCheck(files.Count);
await testEventsRaised.AssertContainerCompletedCheck(files.Count);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.Completed, transfer.TransferStatus);

Expand Down Expand Up @@ -539,7 +539,7 @@ public async Task DirectoryUpload_BlobType(BlobType blobType)
{
Assert.AreEqual(blob.Properties.BlobType, blobType);
}
testEventsRaised.AssertContainerCompletedCheck(2);
await testEventsRaised.AssertContainerCompletedCheck(2);
}
#endregion DirectoryUploadTests

Expand Down Expand Up @@ -637,7 +637,7 @@ await destination.Container.UploadBlobAsync(

if (errorHandling == ErrorHandlingOptions.ContinueOnFailure)
{
testEventsRaised.AssertContainerCompletedWithFailedCheckContinue(1);
await testEventsRaised.AssertContainerCompletedWithFailedCheckContinue(1);

// Verify all files exist, meaning files without conflict were transferred.
Assert.IsTrue(files
Expand All @@ -647,7 +647,7 @@ await destination.Container.UploadBlobAsync(
}
else if (errorHandling == ErrorHandlingOptions.StopOnAllFailures)
{
testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
await testEventsRaised.AssertContainerCompletedWithFailedCheck(1);

// Cannot do any file verification as transfer may proceed while job being cancelled
}
Expand Down Expand Up @@ -736,7 +736,7 @@ public async Task StartTransfer_AwaitCompletion()
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.Completed, transfer.TransferStatus);
testEventsRaised.AssertContainerCompletedCheck(4);
await testEventsRaised.AssertContainerCompletedCheck(4);
}

[Test]
Expand Down Expand Up @@ -766,7 +766,7 @@ public async Task StartTransfer_AwaitCompletion_Failed()
await transfer.AwaitCompletion(cancellationTokenSource.Token).ConfigureAwait(false);

// Assert
testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
await testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithFailedTransfers, transfer.TransferStatus);
Expand Down Expand Up @@ -801,7 +801,7 @@ public async Task StartTransfer_AwaitCompletion_Skipped()
await transfer.AwaitCompletion(cancellationTokenSource.Token).ConfigureAwait(false);

// Assert
testEventsRaised.AssertContainerCompletedWithSkippedCheck(1);
await testEventsRaised.AssertContainerCompletedWithSkippedCheck(1);
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithSkippedTransfers, transfer.TransferStatus);
Expand Down Expand Up @@ -830,7 +830,7 @@ public async Task StartTransfer_EnsureCompleted()
transfer.EnsureCompleted(cancellationTokenSource.Token);

// Assert
testEventsRaised.AssertContainerCompletedCheck(4);
await testEventsRaised.AssertContainerCompletedCheck(4);
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.Completed, transfer.TransferStatus);
Expand Down Expand Up @@ -863,7 +863,7 @@ public async Task StartTransfer_EnsureCompleted_Failed()
transfer.EnsureCompleted(cancellationTokenSource.Token);

// Assert
testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
await testEventsRaised.AssertContainerCompletedWithFailedCheck(1);
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithFailedTransfers, transfer.TransferStatus);
Expand Down Expand Up @@ -898,7 +898,7 @@ public async Task StartTransfer_EnsureCompleted_Skipped()
transfer.EnsureCompleted(cancellationTokenSource.Token);

// Assert
testEventsRaised.AssertContainerCompletedWithSkippedCheck(1);
await testEventsRaised.AssertContainerCompletedWithSkippedCheck(1);
Assert.NotNull(transfer);
Assert.IsTrue(transfer.HasCompleted);
Assert.AreEqual(StorageTransferStatus.CompletedWithSkippedTransfers, transfer.TransferStatus);
Expand Down
Loading