Skip to content

Re-record tests after updating to use CreateIfNotExists #15638

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
2 commits merged into from
Oct 2, 2020
Merged

Re-record tests after updating to use CreateIfNotExists #15638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec6fd3d
Re-record tests
JoshLove-msft Oct 2, 2020
ebcde19
Datalake
JoshLove-msft Oct 2, 2020
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
52 changes: 26 additions & 26 deletions sdk/storage/Azure.Storage.Blobs/tests/AppendBlobClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ public async Task CreateIfNotExistsAsync_Exists()
// Arrange
var blobName = GetNewBlobName();
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(blobName));
Response<BlobContentInfo> response = await blob.CreateAsync();
Response<BlobContentInfo> response = await blob.CreateIfNotExistsAsync();

// Act
Response<BlobContentInfo> responseExists = await blob.CreateIfNotExistsAsync();
Expand Down Expand Up @@ -511,7 +511,7 @@ public async Task AppendBlockAsync()
// Arrange
var blobName = GetNewBlobName();
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(blobName));
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();
const int blobSize = Constants.KB;
var data = GetRandomBuffer(blobSize);

Expand Down Expand Up @@ -540,7 +540,7 @@ public async Task AppendBlockAsync_CPK()
CustomerProvidedKey customerProvidedKey = GetCustomerProvidedKey();
blob = InstrumentClient(blob.WithCustomerProvidedKey(customerProvidedKey));
var data = GetRandomBuffer(Constants.KB);
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();

// Act
using var stream = new MemoryStream(data);
Expand All @@ -562,7 +562,7 @@ public async Task AppendBlockAsync_EncryptionScope()
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(blobName));
blob = InstrumentClient(blob.WithEncryptionScope(TestConfigDefault.EncryptionScope));
var data = GetRandomBuffer(Constants.KB);
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();

// Act
using var stream = new MemoryStream(data);
Expand All @@ -580,7 +580,7 @@ public async Task AppendBlockAsync_MD5()

// Arrange
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();
var data = GetRandomBuffer(Constants.KB);

// Act
Expand All @@ -602,7 +602,7 @@ public async Task AppendBlockAsync_MD5Fail()

// Arrange
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();
var data = GetRandomBuffer(Constants.KB);

// Act
Expand Down Expand Up @@ -655,7 +655,7 @@ public async Task AppendBlockAsync_AccessConditions()

// Arrange
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();
var data = GetRandomBuffer(7);
parameters.Match = await SetupBlobMatchCondition(blob, parameters.Match);
parameters.LeaseId = await SetupBlobLeaseCondition(blob, parameters.LeaseId, garbageLeaseId);
Expand Down Expand Up @@ -699,7 +699,7 @@ public async Task AppendBlockAsync_AccessConditionsFail()
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
var data = GetRandomBuffer(7);
// AppendBlob needs to exists for us to test CreateAsync() with access conditions
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();
parameters.NoneMatch = await SetupBlobMatchCondition(blob, parameters.NoneMatch);
AppendBlobRequestConditions accessConditions = BuildDestinationAccessConditions(
parameters: parameters,
Expand Down Expand Up @@ -792,7 +792,7 @@ public async Task AppendBlockAsync_WithUnreliableConnection()
AppendBlobClient blobFaulty = InstrumentClient(containerFaulty.GetAppendBlobClient(blobName));
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(blobName));

await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();

var data = GetRandomBuffer(blobSize);
var progressBag = new System.Collections.Concurrent.ConcurrentBag<long>();
Expand Down Expand Up @@ -835,7 +835,7 @@ public async Task AppendBlockAsync_ProgressReporting()
// Arrange
var blobName = GetNewBlobName();
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(blobName));
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();
const int blobSize = 4 * Constants.MB;
var data = GetRandomBuffer(blobSize);
TestProgress progress = new TestProgress();
Expand Down Expand Up @@ -916,11 +916,11 @@ public async Task AppendBlockFromUriAsync_Min()
using (var stream = new MemoryStream(data))
{
AppendBlobClient sourceBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await sourceBlob.CreateAsync();
await sourceBlob.CreateIfNotExistsAsync();
await sourceBlob.AppendBlockAsync(stream);

AppendBlobClient destBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await destBlob.CreateAsync();
await destBlob.CreateIfNotExistsAsync();

// Act
await destBlob.AppendBlockFromUriAsync(sourceBlob.Uri, new HttpRange(0, Constants.KB));
Expand All @@ -940,13 +940,13 @@ public async Task AppendBlockFromUriAsync_CPK()
using (var stream = new MemoryStream(data))
{
AppendBlobClient sourceBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await sourceBlob.CreateAsync();
await sourceBlob.CreateIfNotExistsAsync();
await sourceBlob.AppendBlockAsync(stream);

AppendBlobClient destBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
CustomerProvidedKey customerProvidedKey = GetCustomerProvidedKey();
destBlob = InstrumentClient(destBlob.WithCustomerProvidedKey(customerProvidedKey));
await destBlob.CreateAsync();
await destBlob.CreateIfNotExistsAsync();

// Act
Response<BlobAppendInfo> response = await destBlob.AppendBlockFromUriAsync(
Expand All @@ -971,12 +971,12 @@ public async Task AppendBlockFromUriAsync_EncryptionScope()
using (var stream = new MemoryStream(data))
{
AppendBlobClient sourceBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await sourceBlob.CreateAsync();
await sourceBlob.CreateIfNotExistsAsync();
await sourceBlob.AppendBlockAsync(stream);

AppendBlobClient destBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
destBlob = InstrumentClient(destBlob.WithEncryptionScope(TestConfigDefault.EncryptionScope));
await destBlob.CreateAsync();
await destBlob.CreateIfNotExistsAsync();

// Act
Response<BlobAppendInfo> response = await destBlob.AppendBlockFromUriAsync(
Expand All @@ -1000,11 +1000,11 @@ public async Task AppendBlockFromUriAsync_Range()
using (var stream = new MemoryStream(data))
{
AppendBlobClient sourceBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await sourceBlob.CreateAsync();
await sourceBlob.CreateIfNotExistsAsync();
await sourceBlob.AppendBlockAsync(stream);

AppendBlobClient destBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await destBlob.CreateAsync();
await destBlob.CreateIfNotExistsAsync();

// Act
await destBlob.AppendBlockFromUriAsync(sourceBlob.Uri, new HttpRange(2 * Constants.KB, 2 * Constants.KB));
Expand All @@ -1031,11 +1031,11 @@ public async Task AppendBlockFromUriAsync_MD5()
using (var stream = new MemoryStream(data))
{
AppendBlobClient sourceBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await sourceBlob.CreateAsync();
await sourceBlob.CreateIfNotExistsAsync();
await sourceBlob.AppendBlockAsync(stream);

AppendBlobClient destBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await destBlob.CreateAsync();
await destBlob.CreateIfNotExistsAsync();

// Act
await destBlob.AppendBlockFromUriAsync(
Expand All @@ -1057,11 +1057,11 @@ public async Task AppendBlockFromUriAsync_MD5_Fail()
using (var stream = new MemoryStream(data))
{
AppendBlobClient sourceBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await sourceBlob.CreateAsync();
await sourceBlob.CreateIfNotExistsAsync();
await sourceBlob.AppendBlockAsync(stream);

AppendBlobClient destBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await destBlob.CreateAsync();
await destBlob.CreateIfNotExistsAsync();

// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
Expand Down Expand Up @@ -1104,11 +1104,11 @@ public async Task AppendBlockFromUriAsync_AccessConditions()
using (var stream = new MemoryStream(data))
{
AppendBlobClient sourceBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await sourceBlob.CreateAsync();
await sourceBlob.CreateIfNotExistsAsync();
await sourceBlob.AppendBlockAsync(stream);

AppendBlobClient destBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await destBlob.CreateAsync();
await destBlob.CreateIfNotExistsAsync();

parameters.Match = await SetupBlobMatchCondition(destBlob, parameters.Match);
parameters.SourceIfMatch = await SetupBlobMatchCondition(sourceBlob, parameters.SourceIfMatch);
Expand Down Expand Up @@ -1159,11 +1159,11 @@ public async Task AppendBlockFromUriAsync_AccessConditionsFail()
using (var stream = new MemoryStream(data))
{
AppendBlobClient sourceBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await sourceBlob.CreateAsync();
await sourceBlob.CreateIfNotExistsAsync();
await sourceBlob.AppendBlockAsync(stream);

AppendBlobClient destBlob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
await destBlob.CreateAsync();
await destBlob.CreateIfNotExistsAsync();

parameters.NoneMatch = await SetupBlobMatchCondition(destBlob, parameters.NoneMatch);
parameters.SourceIfNoneMatch = await SetupBlobMatchCondition(sourceBlob, parameters.SourceIfNoneMatch);
Expand Down
14 changes: 7 additions & 7 deletions sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2941,7 +2941,7 @@ public async Task UndeleteAsync()
try
{
BlobBaseClient blob = await GetNewBlobClient(test.Container);
await blob.DeleteAsync();
await blob.DeleteIfExistsAsync();

// Act
Response response = await blob.UndeleteAsync();
Expand Down Expand Up @@ -3107,7 +3107,7 @@ public async Task GetPropertiesAsync_CPK()
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
CustomerProvidedKey customerProvidedKey = GetCustomerProvidedKey();
blob = InstrumentClient(blob.WithCustomerProvidedKey(customerProvidedKey));
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();

// Act
Response<BlobProperties> response = await blob.GetPropertiesAsync();
Expand All @@ -3125,7 +3125,7 @@ public async Task GetPropertiesAsync_EncryptionScope()
// Arrange
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
blob = InstrumentClient(blob.WithEncryptionScope(TestConfigDefault.EncryptionScope));
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();

// Act
Response<BlobProperties> response = await blob.GetPropertiesAsync();
Expand Down Expand Up @@ -3848,7 +3848,7 @@ public async Task SetMetadataAsync_CPK()
CustomerProvidedKey customerProvidedKey = GetCustomerProvidedKey();
blob = InstrumentClient(blob.WithCustomerProvidedKey(customerProvidedKey));
IDictionary<string, string> metadata = BuildMetadata();
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();

// Act
await blob.SetMetadataAsync(metadata);
Expand All @@ -3863,7 +3863,7 @@ public async Task SetMetadataAsync_EncryptionScope()
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
blob = InstrumentClient(blob.WithEncryptionScope(TestConfigDefault.EncryptionScope));
IDictionary<string, string> metadata = BuildMetadata();
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();

// Act
Response<BlobInfo> response = await blob.SetMetadataAsync(metadata);
Expand Down Expand Up @@ -4005,7 +4005,7 @@ public async Task CreateSnapshotAsync_CPK()
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
CustomerProvidedKey customerProvidedKey = GetCustomerProvidedKey();
blob = InstrumentClient(blob.WithCustomerProvidedKey(customerProvidedKey));
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();

// Act
Response<BlobSnapshotInfo> response = await blob.CreateSnapshotAsync();
Expand All @@ -4022,7 +4022,7 @@ public async Task CreateSnapshotAsync_EncryptionScope()
await using DisposingContainer test = await GetTestContainerAsync();
AppendBlobClient blob = InstrumentClient(test.Container.GetAppendBlobClient(GetNewBlobName()));
blob = InstrumentClient(blob.WithEncryptionScope(TestConfigDefault.EncryptionScope));
await blob.CreateAsync();
await blob.CreateIfNotExistsAsync();

// Act
Response<BlobSnapshotInfo> response = await blob.CreateSnapshotAsync();
Expand Down
6 changes: 3 additions & 3 deletions sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public async Task<DisposingContainer> GetTestContainerAsync(
}

BlobContainerClient container = InstrumentClient(service.GetBlobContainerClient(containerName));
await container.CreateAsync(metadata: metadata, publicAccessType: publicAccessType.Value);
await container.CreateIfNotExistsAsync(metadata: metadata, publicAccessType: publicAccessType.Value);
return new DisposingContainer(container);
}

Expand Down Expand Up @@ -489,7 +489,7 @@ public static string ToSasVersion(BlobClientOptions.ServiceVersion serviceVersio
public async Task<PageBlobClient> CreatePageBlobClientAsync(BlobContainerClient container, long size)
{
PageBlobClient blob = InstrumentClient(container.GetPageBlobClient(GetNewBlobName()));
await blob.CreateAsync(size, 0).ConfigureAwait(false);
await blob.CreateIfNotExistsAsync(size, 0).ConfigureAwait(false);
return blob;
}

Expand Down Expand Up @@ -656,7 +656,7 @@ public async ValueTask DisposeAsync()
{
try
{
await Container.DeleteAsync();
await Container.DeleteIfExistsAsync();
Container = null;
}
catch
Expand Down
Loading