Skip to content

Commit 03cc79f

Browse files
authored
[Storage] [DataMovement] Updated sync copy tests to actually use the sync option and not default to async (Azure#36022)
* Updated sync copy tests to actually use the sync option and not default to async * Added missing Async option in the directory async copy tests * Disable large tests again
1 parent ed17988 commit 03cc79f

File tree

3 files changed

+36
-9
lines changed

3 files changed

+36
-9
lines changed

sdk/storage/Azure.Storage.DataMovement/tests/StartTransferAsyncCopyDirectoryTests.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@ private async Task CopyBlobDirectoryAndVerify(
6565
StorageResourceContainer sourceResource =
6666
new BlobDirectoryStorageResourceContainer(container, sourceBlobPrefix);
6767
StorageResourceContainer destinationResource =
68-
new BlobDirectoryStorageResourceContainer(container, destinationBlobPrefix);
68+
new BlobDirectoryStorageResourceContainer(container, destinationBlobPrefix,
69+
new BlobStorageResourceContainerOptions()
70+
{
71+
CopyMethod = TransferCopyMethod.AsyncCopy
72+
});
6973

7074
DataTransfer transfer = await transferManager.StartTransferAsync(sourceResource, destinationResource, options);
7175

sdk/storage/Azure.Storage.DataMovement/tests/StartTransferSyncCopyDirectoryTests.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private async Task CopyBlobDirectoryAndVerify(
6868
new BlobDirectoryStorageResourceContainer(container, destinationBlobPrefix,
6969
new BlobStorageResourceContainerOptions()
7070
{
71-
CopyMethod = TransferCopyMethod.AsyncCopy,
71+
CopyMethod = TransferCopyMethod.SyncCopy,
7272
});
7373

7474
DataTransfer transfer = await transferManager.StartTransferAsync(sourceResource, destinationResource, options);
@@ -491,7 +491,11 @@ private async Task<DataTransfer> CreateStartTransfer(
491491

492492
// Create new source block blob.
493493
StorageResourceContainer sourceResource = new BlobDirectoryStorageResourceContainer(containerClient, sourceBlobPrefix);
494-
StorageResourceContainer destinationResource = new BlobDirectoryStorageResourceContainer(containerClient, destBlobPrefix);
494+
StorageResourceContainer destinationResource = new BlobDirectoryStorageResourceContainer(containerClient, destBlobPrefix,
495+
new BlobStorageResourceContainerOptions()
496+
{
497+
CopyMethod = TransferCopyMethod.SyncCopy
498+
});
495499

496500
// If we want a failure condition to happen
497501
if (createFailedCondition)

sdk/storage/Azure.Storage.DataMovement/tests/StartTransferSyncCopyTests.cs

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using NUnit.Framework;
1414
using Azure.Storage.DataMovement.Blobs;
1515
using Azure.Storage.Blobs.Models;
16-
using Azure.Storage.Shared;
1716
using System.Linq;
1817

1918
namespace Azure.Storage.DataMovement.Tests
@@ -140,7 +139,11 @@ private async Task CopyBlockBlobsAndVerify(
140139
StorageResource sourceResource = new BlockBlobStorageResource(originalBlob);
141140
// Set up destination client
142141
BlockBlobClient destClient = InstrumentClient(container.GetBlockBlobClient(string.Concat(destinationBlobNames[i])));
143-
StorageResource destinationResource = new BlockBlobStorageResource(destClient);
142+
StorageResource destinationResource = new BlockBlobStorageResource(destClient,
143+
new BlockBlobStorageResourceOptions()
144+
{
145+
CopyMethod = TransferCopyMethod.SyncCopy
146+
});
144147
copyBlobInfo.Add(new VerifyBlockBlobCopyFromUriInfo(
145148
localSourceFile,
146149
sourceResource,
@@ -426,7 +429,11 @@ public async Task BlockBlobToBlockBlob_Failure_Exists()
426429
GetNewBlobName(),
427430
size);
428431
StorageResource sourceResource = new BlockBlobStorageResource(blockBlobClient);
429-
StorageResource destinationResource = new BlockBlobStorageResource(destinationClient);
432+
StorageResource destinationResource = new BlockBlobStorageResource(destinationClient,
433+
new BlockBlobStorageResourceOptions()
434+
{
435+
CopyMethod = TransferCopyMethod.SyncCopy
436+
});
430437
TransferManager transferManager = new TransferManager();
431438

432439
// Start transfer and await for completion.
@@ -485,7 +492,11 @@ public async Task AppendBlobToAppendBlob_Error()
485492
size: size);
486493

487494
StorageResource sourceResource = new AppendBlobStorageResource(sourceBlob);
488-
StorageResource destinationResource = new AppendBlobStorageResource(destinationBlob);
495+
StorageResource destinationResource = new AppendBlobStorageResource(destinationBlob,
496+
new AppendBlobStorageResourceOptions()
497+
{
498+
CopyMethod = TransferCopyMethod.SyncCopy
499+
});
489500
TransferManager transferManager = new TransferManager();
490501

491502
// Start transfer and await for completion.
@@ -528,7 +539,11 @@ public async Task PageBlobToPageBlob_Error()
528539
size);
529540
PageBlobClient destinationClient = testContainer.Container.GetPageBlobClient(GetNewBlobName());
530541
StorageResource sourceResource = new PageBlobStorageResource(sourceClient);
531-
StorageResource destinationResource = new PageBlobStorageResource(destinationClient);
542+
StorageResource destinationResource = new PageBlobStorageResource(destinationClient,
543+
new PageBlobStorageResourceOptions()
544+
{
545+
CopyMethod = TransferCopyMethod.SyncCopy
546+
});
532547
TransferManager transferManager = new TransferManager();
533548

534549
// Start transfer and await for completion.
@@ -576,7 +591,11 @@ private async Task<DataTransfer> CreateStartTransfer(
576591
string newSourceFile = Path.Combine(testDirectory.DirectoryPath, sourceBlobName);
577592
BlockBlobClient blockBlobClient = await CreateBlockBlob(containerClient, newSourceFile, sourceBlobName, size);
578593
StorageResource sourceResource = new BlockBlobStorageResource(blockBlobClient);
579-
StorageResource destinationResource = new BlockBlobStorageResource(destinationClient);
594+
StorageResource destinationResource = new BlockBlobStorageResource(destinationClient,
595+
new BlockBlobStorageResourceOptions()
596+
{
597+
CopyMethod = TransferCopyMethod.SyncCopy
598+
});
580599

581600
// Create Transfer Manager with single threaded operation
582601
TransferManagerOptions managerOptions = new TransferManagerOptions()

0 commit comments

Comments
 (0)