Skip to content

Commit 26f9eec

Browse files
jalauzon-msftjalauzon-msft
authored
[Storage][DataMovement] Fix failing Live tests (Azure#46325)
1 parent 6f1ca36 commit 26f9eec

File tree

5 files changed

+80
-51
lines changed

5 files changed

+80
-51
lines changed

‎sdk/storage/Azure.Storage.DataMovement.Files.Shares/tests/Shared/DisposingShare.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Collections.Generic;
66
using System.Threading.Tasks;
77
using BaseShares::Azure.Storage.Files.Shares;
8+
using BaseShares::Azure.Storage.Files.Shares.Models;
89
using Azure.Storage.Test.Shared;
910

1011
namespace Azure.Storage.DataMovement.Files.Shares.Tests
@@ -17,7 +18,11 @@ public class DisposingShare : IDisposingContainer<ShareClient>
1718

1819
public static async Task<DisposingShare> CreateAsync(ShareClient share, IDictionary<string, string> metadata)
1920
{
20-
await share.CreateIfNotExistsAsync(metadata: metadata);
21+
ShareCreateOptions options = new ShareCreateOptions
22+
{
23+
Metadata = metadata
24+
};
25+
await share.CreateIfNotExistsAsync(options);
2126
return new DisposingShare(share);
2227
}
2328

‎sdk/storage/Azure.Storage.DataMovement/tests/PauseResumeTransferTests.cs‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Linq;
99
using System.Threading;
1010
using System.Threading.Tasks;
11-
using Azure.Core;
1211
using Azure.Core.TestFramework;
1312
using Azure.Storage.Blobs;
1413
using Azure.Storage.Blobs.Models;
@@ -423,8 +422,9 @@ public async Task PauseThenResumeTransferAsync(TransferDirection transferType)
423422
// Arrange
424423
using DisposingLocalDirectory checkpointerDirectory = DisposingLocalDirectory.GetTestDirectory();
425424
using DisposingLocalDirectory localDirectory = DisposingLocalDirectory.GetTestDirectory();
426-
await using DisposingContainer sourceContainer = await GetTestContainerAsync(publicAccessType: PublicAccessType.BlobContainer);
427-
await using DisposingContainer destinationContainer = await GetTestContainerAsync();
425+
BlobServiceClient service = GetServiceClient_OAuth();
426+
await using DisposingContainer sourceContainer = await GetTestContainerAsync(service);
427+
await using DisposingContainer destinationContainer = await GetTestContainerAsync(service);
428428

429429
BlobsStorageResourceProvider blobProvider = new(GetSharedKeyCredential());
430430
LocalFilesStorageResourceProvider localProvider = new();
@@ -502,8 +502,9 @@ public async Task ResumeTransferAsync(TransferDirection transferType)
502502
// Arrange
503503
using DisposingLocalDirectory checkpointerDirectory = DisposingLocalDirectory.GetTestDirectory();
504504
using DisposingLocalDirectory localDirectory = DisposingLocalDirectory.GetTestDirectory();
505-
await using DisposingContainer sourceContainer = await GetTestContainerAsync(publicAccessType: PublicAccessType.BlobContainer);
506-
await using DisposingContainer destinationContainer = await GetTestContainerAsync();
505+
BlobServiceClient service = GetServiceClient_OAuth();
506+
await using DisposingContainer sourceContainer = await GetTestContainerAsync(service);
507+
await using DisposingContainer destinationContainer = await GetTestContainerAsync(service);
507508

508509
BlobsStorageResourceProvider blobProvider = new(GetSharedKeyCredential());
509510
LocalFilesStorageResourceProvider localProvider = new();
@@ -577,7 +578,8 @@ public async Task ResumeTransferAsync_Options(TransferDirection transferType)
577578
// Arrange
578579
using DisposingLocalDirectory checkpointerDirectory = DisposingLocalDirectory.GetTestDirectory();
579580
using DisposingLocalDirectory localDirectory = DisposingLocalDirectory.GetTestDirectory();
580-
await using DisposingContainer blobContainer = await GetTestContainerAsync(publicAccessType: PublicAccessType.BlobContainer);
581+
BlobServiceClient service = GetServiceClient_OAuth();
582+
await using DisposingContainer blobContainer = await GetTestContainerAsync(service);
581583

582584
BlobsStorageResourceProvider blobProvider = new(GetSharedKeyCredential());
583585
LocalFilesStorageResourceProvider localProvider = new();
@@ -873,8 +875,9 @@ public async Task TryPauseTransferAsync_DataTransfer_Directory(TransferDirection
873875
using DisposingLocalDirectory checkpointerDirectory = DisposingLocalDirectory.GetTestDirectory();
874876
using DisposingLocalDirectory sourceDirectory = DisposingLocalDirectory.GetTestDirectory();
875877
using DisposingLocalDirectory destinationDirectory = DisposingLocalDirectory.GetTestDirectory();
876-
await using DisposingContainer sourceContainer = await GetTestContainerAsync(publicAccessType: PublicAccessType.BlobContainer);
877-
await using DisposingContainer destinationContainer = await GetTestContainerAsync();
878+
BlobServiceClient service = GetServiceClient_OAuth();
879+
await using DisposingContainer sourceContainer = await GetTestContainerAsync(service);
880+
await using DisposingContainer destinationContainer = await GetTestContainerAsync(service);
878881

879882
BlobsStorageResourceProvider blobProvider = new(GetSharedKeyCredential());
880883
LocalFilesStorageResourceProvider localProvider = new();
@@ -924,8 +927,9 @@ public async Task TryPauseTransferAsync_AlreadyPaused_Directory(TransferDirectio
924927
using DisposingLocalDirectory checkpointerDirectory = DisposingLocalDirectory.GetTestDirectory();
925928
using DisposingLocalDirectory sourceDirectory = DisposingLocalDirectory.GetTestDirectory();
926929
using DisposingLocalDirectory destinationDirectory = DisposingLocalDirectory.GetTestDirectory();
927-
await using DisposingContainer sourceContainer = await GetTestContainerAsync(publicAccessType: PublicAccessType.BlobContainer);
928-
await using DisposingContainer destinationContainer = await GetTestContainerAsync();
930+
BlobServiceClient service = GetServiceClient_OAuth();
931+
await using DisposingContainer sourceContainer = await GetTestContainerAsync(service);
932+
await using DisposingContainer destinationContainer = await GetTestContainerAsync(service);
929933

930934
BlobsStorageResourceProvider blobProvider = new(GetSharedKeyCredential());
931935
LocalFilesStorageResourceProvider localProvider = new();
@@ -981,8 +985,9 @@ public async Task PauseThenResumeTransferAsync_Directory(TransferDirection trans
981985
using DisposingLocalDirectory checkpointerDirectory = DisposingLocalDirectory.GetTestDirectory();
982986
using DisposingLocalDirectory sourceDirectory = DisposingLocalDirectory.GetTestDirectory();
983987
using DisposingLocalDirectory destinationDirectory = DisposingLocalDirectory.GetTestDirectory();
984-
await using DisposingContainer sourceContainer = await GetTestContainerAsync(publicAccessType: PublicAccessType.BlobContainer);
985-
await using DisposingContainer destinationContainer = await GetTestContainerAsync();
988+
BlobServiceClient service = GetServiceClient_OAuth();
989+
await using DisposingContainer sourceContainer = await GetTestContainerAsync(service);
990+
await using DisposingContainer destinationContainer = await GetTestContainerAsync(service);
986991

987992
BlobsStorageResourceProvider blobProvider = new(GetSharedKeyCredential());
988993
LocalFilesStorageResourceProvider localProvider = new();
@@ -1068,8 +1073,9 @@ public async Task ResumeTransferAsync_Directory(TransferDirection transferType)
10681073
using DisposingLocalDirectory checkpointerDirectory = DisposingLocalDirectory.GetTestDirectory();
10691074
using DisposingLocalDirectory sourceDirectory = DisposingLocalDirectory.GetTestDirectory();
10701075
using DisposingLocalDirectory destinationDirectory = DisposingLocalDirectory.GetTestDirectory();
1071-
await using DisposingContainer sourceContainer = await GetTestContainerAsync(publicAccessType: PublicAccessType.BlobContainer);
1072-
await using DisposingContainer destinationContainer = await GetTestContainerAsync();
1076+
BlobServiceClient service = GetServiceClient_OAuth();
1077+
await using DisposingContainer sourceContainer = await GetTestContainerAsync(service);
1078+
await using DisposingContainer destinationContainer = await GetTestContainerAsync(service);
10731079

10741080
BlobsStorageResourceProvider blobProvider = new(GetSharedKeyCredential());
10751081
LocalFilesStorageResourceProvider localProvider = new();
@@ -1162,8 +1168,9 @@ public async Task ResumeTransferAsync_Directory_Large(
11621168
using DisposingLocalDirectory checkpointerDirectory = DisposingLocalDirectory.GetTestDirectory();
11631169
using DisposingLocalDirectory sourceDirectory = DisposingLocalDirectory.GetTestDirectory();
11641170
using DisposingLocalDirectory destinationDirectory = DisposingLocalDirectory.GetTestDirectory();
1165-
await using DisposingContainer sourceContainer = await GetTestContainerAsync(publicAccessType: PublicAccessType.BlobContainer);
1166-
await using DisposingContainer destinationContainer = await GetTestContainerAsync();
1171+
BlobServiceClient service = GetServiceClient_OAuth();
1172+
await using DisposingContainer sourceContainer = await GetTestContainerAsync(service);
1173+
await using DisposingContainer destinationContainer = await GetTestContainerAsync(service);
11671174

11681175
BlobsStorageResourceProvider blobProvider = new(GetSharedKeyCredential());
11691176
LocalFilesStorageResourceProvider localProvider = new();

‎sdk/storage/Azure.Storage.DataMovement/tests/ProgressHandlerTests.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ await TransferAndAssertProgress(
192192
public async Task ProgressHandler_Copy()
193193
{
194194
// Arrange
195-
await using DisposingContainer source = await GetTestContainerAsync(publicAccessType: PublicAccessType.Blob);
195+
BlobServiceClient service = GetServiceClient_OAuth();
196+
await using DisposingContainer source = await GetTestContainerAsync(service);
196197
await using DisposingContainer destination = await GetTestContainerAsync();
197198

198199
await PopulateTestContainer(source.Container);
@@ -255,8 +256,9 @@ public async Task ProgressHandler_Chunks(TransferDirection transferType)
255256
int fileCount = 10;
256257
int chunkSize = Constants.KB / 2;
257258

259+
BlobServiceClient service = GetServiceClient_OAuth();
258260
using DisposingLocalDirectory localDirectory = DisposingLocalDirectory.GetTestDirectory();
259-
await using DisposingContainer sourceContainer = await GetTestContainerAsync(publicAccessType: PublicAccessType.Blob);
261+
await using DisposingContainer sourceContainer = await GetTestContainerAsync(service);
260262
await using DisposingContainer destinationContainer = await GetTestContainerAsync();
261263

262264
StorageResourceContainer sourceResource;

0 commit comments

Comments
 (0)