Skip to content

Commit d1d93d4

Browse files
amnguyeamnguye
authored
[Storage] [Tests] Dispose use of CancellationTokenSource (Azure#52835)
* [Storage] [Tests] Dispose use of CancellationTokenSource * Fix datalake paritioned tests cts
1 parent 1ccd837 commit d1d93d4

13 files changed

+75
-63
lines changed

‎sdk/storage/Azure.Storage.Blobs/AzureStorageNetMigrationV12.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ V12
815815

816816
```C# Snippet:SampleSnippetsBlobMigration_MaximumExecutionTime
817817
BlobClient blobClient = containerClient.GetBlobClient(blobName);
818-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
818+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
819819
cancellationTokenSource.CancelAfter(TimeSpan.FromSeconds(30));
820820
Stream targetStream = new MemoryStream();
821821
await blobClient.DownloadToAsync(targetStream, cancellationTokenSource.Token);

‎sdk/storage/Azure.Storage.Blobs/samples/Sample03_Migrations.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ public async Task MaximumExecutionTime()
11941194

11951195
#region Snippet:SampleSnippetsBlobMigration_MaximumExecutionTime
11961196
BlobClient blobClient = containerClient.GetBlobClient(blobName);
1197-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
1197+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
11981198
cancellationTokenSource.CancelAfter(TimeSpan.FromSeconds(30));
11991199
Stream targetStream = new MemoryStream();
12001200
await blobClient.DownloadToAsync(targetStream, cancellationTokenSource.Token);

‎sdk/storage/Azure.Storage.Blobs/tests/BlobClientTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,7 +1397,7 @@ public async Task Upload_Stress()
13971397
try
13981398
{
13991399
// Create a CancellationToken that times out after 60s
1400-
CancellationTokenSource source = new CancellationTokenSource(TimeSpan.FromSeconds(60));
1400+
using CancellationTokenSource source = new CancellationTokenSource(TimeSpan.FromSeconds(60));
14011401
CancellationToken token = source.Token;
14021402

14031403
// Keep uploading a GB
@@ -1449,7 +1449,7 @@ async Task AssertDownloadToAsync()
14491449
// Create a CancellationToken that times out after .01s
14501450
// Intentionally not delaying here, as DownloadToAsync operation should always cancel
14511451
// since it buffers the full response.
1452-
CancellationTokenSource source = new CancellationTokenSource(TimeSpan.FromSeconds(.01));
1452+
using CancellationTokenSource source = new CancellationTokenSource(TimeSpan.FromSeconds(.01));
14531453
CancellationToken token = source.Token;
14541454

14551455
// Verifying DownloadTo will cancel

‎sdk/storage/Azure.Storage.DataMovement.Blobs/tests/BlobContainerClientExtensionsIntegrationTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public async Task UploadDirectoryAsync_WaitUntil_Completed()
260260
TestEventsRaised testEventsRaised = new(options);
261261

262262
// Act
263-
CancellationTokenSource cancellationTokenSource = new(TimeSpan.FromSeconds(30));
263+
using CancellationTokenSource cancellationTokenSource = new(TimeSpan.FromSeconds(30));
264264
TransferOperation transferOperation = await CreateStartUploadDirectoryAsync_WithOptions(
265265
directoryPath,
266266
containerClient,
@@ -491,7 +491,7 @@ public async Task DownloadToDirectoryAsync_WaitUntil_Ccompleted()
491491
TestEventsRaised testEventsRaised = new(options);
492492

493493
// Act
494-
CancellationTokenSource cancellationTokenSource = new(TimeSpan.FromSeconds(30));
494+
using CancellationTokenSource cancellationTokenSource = new(TimeSpan.FromSeconds(30));
495495
TransferOperation transferOperation = await CreateStartDownloadToDirectoryAsync_WithOptions(
496496
directoryPath,
497497
containerClient,

‎sdk/storage/Azure.Storage.DataMovement.Blobs/tests/BlockBlobDirectoryToDirectoryTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public async Task DirectoryCopyWithVirtualDirectories(
157157
GetSourceStorageResourceContainer(destinationContainer.Container, destinationPrefix),
158158
transferOptions);
159159

160-
CancellationTokenSource tokenSource = new(TimeSpan.FromSeconds(30));
160+
using CancellationTokenSource tokenSource = new(TimeSpan.FromSeconds(30));
161161
await TestTransferWithTimeout.WaitForCompletionAsync(
162162
transfer,
163163
testEventsRaised,

‎sdk/storage/Azure.Storage.DataMovement/tests/Shared/PauseResumeTransferTestBase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,7 @@ public async Task ResumeTransferAsync_Directory_Large(
12071207
await Task.Delay(delayInMs);
12081208

12091209
// Pause Transfer
1210-
CancellationTokenSource pauseCancellation = new CancellationTokenSource(TimeSpan.FromSeconds(30));
1210+
using CancellationTokenSource pauseCancellation = new CancellationTokenSource(TimeSpan.FromSeconds(30));
12111211
await transferManager.PauseTransferAsync(transfer.Id, pauseCancellation.Token);
12121212
Assert.AreEqual(TransferState.Paused, transfer.Status.State);
12131213

@@ -1256,7 +1256,7 @@ public async Task PauseAllTriggersCorrectPauses()
12561256
manager._transfers.TryAdd(Guid.NewGuid().ToString(), transfer.Object);
12571257
}
12581258

1259-
CancellationTokenSource token = new CancellationTokenSource(TimeSpan.FromSeconds(30));
1259+
using CancellationTokenSource token = new CancellationTokenSource(TimeSpan.FromSeconds(30));
12601260
await manager.PauseAllRunningTransfersAsync(token.Token);
12611261

12621262
foreach (Mock<TransferOperation> transfer in pausable)

‎sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferCopyTestBase.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ private async Task CopyRemoteObjectsAndVerify(
344344
{
345345
// Assert
346346
Assert.NotNull(copyObjectInfo[i].TransferOperation);
347-
CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTimeInSec));
347+
using CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTimeInSec));
348348
await TestTransferWithTimeout.WaitForCompletionAsync(
349349
copyObjectInfo[i].TransferOperation,
350350
copyObjectInfo[i].testEventsRaised,
@@ -589,7 +589,7 @@ public async Task SourceObjectToDestinationObject_Skip_Exists()
589589
sourceResource,
590590
destinationResource,
591591
options);
592-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
592+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
593593
await TestTransferWithTimeout.WaitForCompletionAsync(
594594
transfer,
595595
testEventsRaised,
@@ -649,7 +649,7 @@ public async Task SourceObjectToDestinationObject_Failure_Exists()
649649
sourceResource,
650650
destinationResource,
651651
options);
652-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
652+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
653653
await TestTransferWithTimeout.WaitForCompletionAsync(
654654
transfer,
655655
testEventsRaised,
@@ -737,7 +737,7 @@ public async Task StartTransfer_AwaitCompletion()
737737
options: options);
738738

739739
// Act
740-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
740+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
741741
await TestTransferWithTimeout.WaitForCompletionAsync(
742742
transfer,
743743
testEventsRaised,
@@ -772,7 +772,7 @@ public async Task StartTransfer_AwaitCompletion_Failed()
772772
options: options);
773773

774774
// Act
775-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
775+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
776776
await TestTransferWithTimeout.WaitForCompletionAsync(
777777
transfer,
778778
testEventsRaised,
@@ -818,7 +818,7 @@ public async Task StartTransfer_AwaitCompletion_Skipped()
818818
options: options);
819819

820820
// Act
821-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
821+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
822822
await TestTransferWithTimeout.WaitForCompletionAsync(
823823
transfer,
824824
testEventsRaised,
@@ -867,7 +867,7 @@ private async Task CopyRemoteObjects_VerifyProperties(
867867
sourceResource,
868868
destinationResource,
869869
options);
870-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
870+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
871871
await TestTransferWithTimeout.WaitForCompletionAsync(
872872
transfer,
873873
testEventsRaised,

‎sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryCopyTestBase.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ private async Task CopyDirectoryAndVerifyAsync(
265265
TransferOperation transfer = await transferManager.StartTransferAsync(sourceResource, destinationResource, options);
266266

267267
// Assert
268-
CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTimeInSec));
268+
using CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTimeInSec));
269269
await TestTransferWithTimeout.WaitForCompletionAsync(
270270
transfer,
271271
testEventFailed,
@@ -390,7 +390,7 @@ public async Task DirectoryToDirectory_EmptyFolder()
390390
// Act
391391
TransferOperation transfer = await transferManager.StartTransferAsync(sourceResource, destinationResource, options);
392392

393-
CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(10));
393+
using CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(10));
394394
await TestTransferWithTimeout.WaitForCompletionAsync(
395395
transfer,
396396
testEventsRaised,
@@ -749,7 +749,7 @@ public async Task StartTransfer_AwaitCompletion()
749749
options: options);
750750

751751
// Act
752-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
752+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
753753
await TestTransferWithTimeout.WaitForCompletionAsync(
754754
transfer,
755755
testEventsRaised,
@@ -785,7 +785,7 @@ public async Task StartTransfer_AwaitCompletion_Failed()
785785
options: options);
786786

787787
// Act
788-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
788+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
789789
await TestTransferWithTimeout.WaitForCompletionAsync(
790790
transfer,
791791
testEventsRaised,
@@ -823,7 +823,7 @@ public async Task StartTransfer_AwaitCompletion_Skipped()
823823
options: options);
824824

825825
// Act
826-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
826+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
827827
await TestTransferWithTimeout.WaitForCompletionAsync(
828828
transfer,
829829
testEventsRaised,
@@ -863,7 +863,7 @@ public async Task StartTransfer_AwaitCompletion_Failed_SmallChunks()
863863
size: DataMovementTestConstants.KB * 4);
864864

865865
// Act
866-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
866+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
867867
await TestTransferWithTimeout.WaitForCompletionAsync(
868868
transfer,
869869
testEventsRaised,
@@ -924,7 +924,7 @@ private async Task CopyRemoteObjects_VerifyProperties(
924924
destinationResource,
925925
options).ConfigureAwait(false);
926926

927-
CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
927+
using CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
928928
await TestTransferWithTimeout.WaitForCompletionAsync(
929929
transfer,
930930
testEventsRaised,

‎sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryDownloadTestBase.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public async Task DownloadDirectoryAsync_Small(int size, int waitInSec)
190190
string.Join("/", sourceDirectoryName, "bar", "pik", GetNewObjectName()),
191191
};
192192

193-
CancellationTokenSource cts = new();
193+
using CancellationTokenSource cts = new();
194194
cts.CancelAfter(TimeSpan.FromSeconds(waitInSec));
195195
await DownloadDirectoryAndVerifyAsync(
196196
test.Container,
@@ -220,7 +220,7 @@ public async Task DownloadDirectoryAsync_Large(int size, int waitInSec)
220220
string.Join("/", sourceDirectoryName, "bar", "pik", GetNewObjectName()),
221221
};
222222

223-
CancellationTokenSource cts = new();
223+
using CancellationTokenSource cts = new();
224224
cts.CancelAfter(waitInSec);
225225
await DownloadDirectoryAndVerifyAsync(
226226
test.Container,
@@ -237,7 +237,7 @@ public async Task DownloadDirectoryAsync_Empty()
237237
using DisposingLocalDirectory testDirectory = DisposingLocalDirectory.GetTestDirectory();
238238
string sourceDirectoryName = "foo";
239239
string destinationFolder = CreateRandomDirectory(testDirectory.DirectoryPath);
240-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
240+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
241241

242242
await SetupSourceDirectoryAsync(test.Container, sourceDirectoryName, new(), cancellationTokenSource.Token);
243243

@@ -494,7 +494,7 @@ public async Task StartTransfer_AwaitCompletion()
494494
await using IDisposingContainer<TContainerClient> test = await GetDisposingContainerAsync();
495495
using DisposingLocalDirectory testDirectory = DisposingLocalDirectory.GetTestDirectory();
496496
string destinationFolder = CreateRandomDirectory(testDirectory.DirectoryPath);
497-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
497+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
498498

499499
// Create transfer to do a AwaitCompletion
500500
TransferOptions options = new TransferOptions();
@@ -527,7 +527,7 @@ public async Task StartTransfer_AwaitCompletion_Failed()
527527
await using IDisposingContainer<TContainerClient> test = await GetDisposingContainerAsync();
528528
using DisposingLocalDirectory testDirectory = DisposingLocalDirectory.GetTestDirectory();
529529
string destinationFolder = CreateRandomDirectory(testDirectory.DirectoryPath);
530-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
530+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
531531

532532
TransferOptions options = new TransferOptions()
533533
{
@@ -568,7 +568,7 @@ public async Task StartTransfer_AwaitCompletion_Skipped()
568568
await using IDisposingContainer<TContainerClient> test = await GetDisposingContainerAsync();
569569
using DisposingLocalDirectory testDirectory = DisposingLocalDirectory.GetTestDirectory();
570570
string destinationFolder = CreateRandomDirectory(testDirectory.DirectoryPath);
571-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
571+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
572572

573573
// Create transfer options with Skipping available
574574
TransferOptions options = new TransferOptions()
@@ -610,7 +610,7 @@ public async Task StartTransfer_AwaitCompletion_Failed_SmallChunks()
610610
await using IDisposingContainer<TContainerClient> test = await GetDisposingContainerAsync();
611611
using DisposingLocalDirectory testDirectory = DisposingLocalDirectory.GetTestDirectory();
612612
string destinationFolder = CreateRandomDirectory(testDirectory.DirectoryPath);
613-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
613+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
614614

615615
TransferOptions options = new TransferOptions()
616616
{

‎sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDownloadTestBase.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public async Task StartTransfer_AwaitCompletion()
172172
options: options);
173173

174174
// Act
175-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
175+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
176176
await TestTransferWithTimeout.WaitForCompletionAsync(
177177
transfer,
178178
failureTransferHolder,
@@ -207,7 +207,7 @@ public async Task StartTransfer_AwaitCompletion_Failed()
207207
options: options);
208208

209209
// Act
210-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
210+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
211211
await TestTransferWithTimeout.WaitForCompletionAsync(
212212
transfer,
213213
testEventRaised,
@@ -246,7 +246,7 @@ public async Task StartTransfer_AwaitCompletion_Skipped()
246246
options: options);
247247

248248
// Act
249-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
249+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
250250
await TestTransferWithTimeout.WaitForCompletionAsync(
251251
transfer,
252252
testEventRaised,
@@ -375,7 +375,7 @@ private async Task DownloadObjectsAndVerify(
375375
{
376376
// Assert
377377
Assert.NotNull(downloadedObjectInfo[i].TransferOperation);
378-
CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTimeInSec));
378+
using CancellationTokenSource tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTimeInSec));
379379
await TestTransferWithTimeout.WaitForCompletionAsync(
380380
downloadedObjectInfo[i].TransferOperation,
381381
downloadedObjectInfo[i].EventsRaised,
@@ -507,7 +507,7 @@ public async Task RemoteObjectToLocal_Skip_Exists()
507507
GetStorageResourceItem(sourceClient),
508508
destinationResource,
509509
options);
510-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
510+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
511511
await TestTransferWithTimeout.WaitForCompletionAsync(
512512
transfer,
513513
testEventsRaised,
@@ -558,7 +558,7 @@ public async Task RemoteObjectToLocal_Failure_Exists()
558558
GetStorageResourceItem(sourceClient),
559559
destinationResource,
560560
options);
561-
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
561+
using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
562562
await TestTransferWithTimeout.WaitForCompletionAsync(
563563
transfer,
564564
testEventsRaised,

0 commit comments

Comments
 (0)